Home Explore Help
Sign In
dfanfdsanfdsa
/
ood-ports-lbsd-fork1
forked from jimmy/ood-ports-lbsd
Watch 1
Star 0
Fork 0
Files
Tree: f08698bfd3
Branches Tags
ood-ports-lb...
/
editors
/
elvis
/
patches
/
patch-guix11_xdialog_c

patch-guix11_xdialog_c 1.4 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. $OpenBSD: patch-guix11_xdialog_c,v 1.1 2008/12/11 13:58:14 jasper Exp $
    2. 

  2. 

  3. Prevent symbol clash with stdio.h .
    4. 

  4. 

  5. --- guix11/xdialog.c.orig	Tue Dec  9 23:32:39 2008
    6. 

  6. +++ guix11/xdialog.c	Tue Dec  9 23:33:34 2008
    7. 

  7. @@ -387,7 +387,7 @@ static void parsespec(dia)
    8. 

  8.  			  case 'o': ft = FT_ONEOF, limit = scan;	break;
    9. 

  9.  			  case 'n': ft = FT_NUMBER, limit = scan;	break;
    10. 

  10.  			  case 's': ft = FT_STRING;			break;
    11. 

  11. -			  case 'f': ft = FT_FILE;			break;
    12. 

  12. +			  case 'f': ft = ELV_FT_FILE;			break;
    13. 

  13.  			  case 'l': ft = FT_LOCKED;			break;
    14. 

  14.  			}
    15. 

  15.  
    16. 

  16. @@ -556,7 +556,7 @@ void x_dl_add(xw, name, desc, excmd, spec)
    17. 

  17.  			break;
    18. 

  18.  
    19. 

  19.  		  case FT_STRING:
    20. 

  20. -		  case FT_FILE:
    21. 

  21. +		  case ELV_FT_FILE:
    22. 

  22.  			button = addbutton(dia, "<", 'l', ELVCTRL('L'));
    23. 

  23.  			button->y = dia->y0 + dia->rowh * i;
    24. 

  24.  			button->x = dia->x0 + 3;
    25. 

  25. @@ -1111,7 +1111,7 @@ static void keystroke(dia, key)
    26. 

  26.  			newvalue = keystring(dia, key);
    27. 

  27.  			break;
    28. 

  28.  
    29. 

  29. -		  case FT_FILE:
    30. 

  30. +		  case ELV_FT_FILE:
    31. 

  31.  #ifdef FEATURE_COMPLETE
    32. 

  32.  			if (key == '\t')
    33. 

  33.  			{
    34. 

  34. @@ -1179,7 +1179,7 @@ static void exposerow(dia, row, fromscratch)
    35. 

  35.  	switch (dia->field[row].ft)
    36. 

  36.  	{
    37. 

  37.  	  case FT_STRING:
    38. 

  38. -	  case FT_FILE:
    39. 

  39. +	  case ELV_FT_FILE:
    40. 

  40.  	  case FT_NUMBER:
    41. 

  41.  	  case FT_LOCKED:
    42. 

  42.  		drawtext(dia, row);
    43. 

  43. @@ -1207,7 +1207,7 @@ static void exposerow(dia, row, fromscratch)
    44. 

  44.  			break;
    45. 

  45.  
    46. 

  46.  		  case FT_STRING:
    47. 

  47. -		  case FT_FILE:
    48. 

  48. +		  case ELV_FT_FILE:
    49. 

  49.  			if (button->shape == 'l')
    50. 

  50.  				if (row == dia->current
    51. 

  51.  				    ? dia->shift > 0
    52. 

  52.