Small changes

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 994cb5e0bf13c3e33c75b3550e98ed2fc16508ad..5758c9f800d0dffae96a98251d03dbbb8ff489d4 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/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

diff --git a/src/common/extended.c b/src/common/extended.c
index 3bba986f4b6527e43210db6c81b6d29f19abdd57..1dae07e953a493a7911a39ac9911222b22f0f222 100644 (file)
--- a/src/common/extended.c
+++ b/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++ */
 }
 
 /*

diff --git a/src/make.env b/src/make.env
index 1ad49be955c1601d66fe421c5acec38e5485e3f0..8bbc6e78ed4b224e3c36c383415695face643196 100644 (file)
--- a/src/make.env
+++ b/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

diff --git a/src/makeenvs/linux.env b/src/makeenvs/linux.env
index 1ad49be955c1601d66fe421c5acec38e5485e3f0..8bbc6e78ed4b224e3c36c383415695face643196 100644 (file)
--- a/src/makeenvs/linux.env
+++ b/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

diff --git a/src/makeenvs/sgi.env b/src/makeenvs/sgi.env
index 64d10750c65c7a98eb1fbd8636c5813298b08330..e1d1b2fd13db4c3a52e10048e2413a1fa9e6d565 100644 (file)
--- a/src/makeenvs/sgi.env
+++ b/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

diff --git a/src/makeenvs/solaris.env b/src/makeenvs/solaris.env
index a6c8d1b7fd2c8745fc1f02819499ed7208868db5..3b7c52adbba18435e947d3eb2bb1f0f85819fe48 100644 (file)
--- a/src/makeenvs/solaris.env
+++ b/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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index c172156bbca3c0175ad103f0ec7248c51155c1e6..15b53d06b8bc029a68572ebbcb4da8d9aa11f8c4 100644 (file)
--- a/src/motif/makefile.unx
+++ b/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\