Small changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/toolbar/test.cpp

@@ -160,7 +160,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_HELP, MyFrame::OnAbout)
     EVT_CLOSE(MyFrame::OnCloseWindow)
     EVT_TOOL_RANGE(wxID_OPEN, wxID_PASTE, MyFrame::OnToolLeftClick)
-    EVT_TOOL_ENTER(wxID_OPEN, MyFrame::OnToolEnter)
+    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
 END_EVENT_TABLE()
 
 // Define my frame constructor

src/common/extended.c

@@ -82,10 +82,10 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
 		}
 	}
 
-    // disable the warning about 'possible loss of data'
+    /* disable the warning about 'possible loss of data' */
     #ifdef _MSC_VER
         #pragma warning(disable: 4244)
-    #endif // Visual C++
+    #endif /* Visual C++ */
 
 	bytes[0] = expon >> 8;
 	bytes[1] = expon;
@@ -100,7 +100,7 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
 
     #ifdef _MSC_VER
         #pragma warning(default: 4244)
-    #endif // Visual C++
+    #endif /* Visual C++ */
 }
 
 /*

src/make.env

@@ -22,6 +22,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib

src/makeenvs/linux.env

@@ -22,6 +22,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib

src/makeenvs/sgi.env

@@ -23,6 +23,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = echo

src/makeenvs/solaris.env

@@ -22,6 +22,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib

src/motif/makefile.unx

@@ -174,7 +174,7 @@ LIB_C_SRC=\
 EXTRA_C_SRC=\
   xmcombo/xmcombo.c
 
-EXTRA_CPP_SRC=\
+EXTRA_CPP_SRC=
 
 #  mdi/lib/XsComponent.C\
 #  mdi/lib/XsMDICanvas.C\