From 777553d227ce02078f6509a785e84715fbddc7d6 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 25 Feb 1999 15:09:23 +0000
Subject: [PATCH] Small changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/toolbar/test.cpp | 2 +-
 src/common/extended.c    | 6 +++---
 src/make.env             | 2 ++
 src/makeenvs/linux.env   | 2 ++
 src/makeenvs/sgi.env     | 2 ++
 src/makeenvs/solaris.env | 2 ++
 src/motif/makefile.unx   | 2 +-
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 994cb5e0bf..5758c9f800 100644
--- 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 3bba986f4b..1dae07e953 100644
--- 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 1ad49be955..8bbc6e78ed 100644
--- 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 1ad49be955..8bbc6e78ed 100644
--- 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 64d10750c6..e1d1b2fd13 100644
--- 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 a6c8d1b7fd..3b7c52adbb 100644
--- 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 c172156bbc..15b53d06b8 100644
--- 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\
-- 
2.45.2