removed the pad from wxWindow::DoGetBestSize(), now do it in Fit() only

[wxWidgets.git] / src / common / doslex.c

diff --git a/src/common/doslex.c b/src/common/doslex.c
index 3dbdde99eda55b24a2917bc31c5e232efb71a95f..be7be146d1539e1bd478c433a8fd16c3f2cca8dc 100644 (file)
--- a/src/common/doslex.c
+++ b/src/common/doslex.c
@@ -145,7 +145,7 @@ int read();
                } \
        while ( 0 )
 #else
                } \
        while ( 0 )
 #else

-// suppress expression always false warning
+/* suppress expression always false warning */

 int os2var = 0;
 #define YY_FATAL_ERROR(msg) \
        do \
 int os2var = 0;
 #define YY_FATAL_ERROR(msg) \
        do \


@@ -252,7 +252,9 @@ static int my_unput(char);
        if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
            YY_FATAL_ERROR( "read() in flex scanner failed" );
 #else
        if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
            YY_FATAL_ERROR( "read() in flex scanner failed" );
 #else

-# undef unput
+# ifndef unput
+#  undef unput
+# endif

 # define unput(_c) my_unput(_c)
 #endif
 
 # define unput(_c) my_unput(_c)
 #endif
 


@@ -775,7 +777,7 @@ case YY_STATE_EOF(INITIAL):
            }
        }
 #if defined(__VISAGECPP__)
            }
        }
 #if defined(__VISAGECPP__)

-// VA complains about proc maybe not returning a value so return one
+/* VA complains about proc maybe not returning a value so return one */

 return 0;
 #endif
     }
 return 0;
 #endif
     }