Fixes for VC++ 4 compilation; fixed wxCommandEvent arg in grid.h;

added $(RM) variable to Mingw32 makefile

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

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 11705b2128ff3891fac7e4169a08518e4fea339b..95dad3b9676cf29dda765596093fafa86a25a74c 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -243,10 +243,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-       copy ..\common\dosyacc.c ..\common\y_tab.c
+       copy ..\\common\\dosyacc.c ..\\common\\y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-       copy ..\common\doslex.c ..\common\lex_yy.c
+       copy ..\\common\doslex.c ..\\common\\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -279,21 +279,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
-       rm -f *.o
-       rm -f *.bak
-       rm -f core
-       rm -f ..\common\y_tab.c
-       rm -f ..\common\lex_yy.c
-       rm -f ..\common\*.o
-       rm -f ..\common\*.bak
-       rm -f ..\generic\*.o
-       rm -f ..\generic\*.bak
-       rm -f ..\html\*.o
-       rm -f ..\png\*.o
-       rm -f ..\png\*.bak
-       rm -f ..\zlib\*.o
-       rm -f ..\zlib\*.bak
-       rm -f ..\jpeg\*.o
-       rm -f ..\..\lib\libwx.a
+       -$(RM) *.o
+       -$(RM) *.bak
+       -$(RM) core
+       -$(RM) ..\common\y_tab.c
+       -$(RM) ..\common\lex_yy.c
+       -$(RM) ..\common\*.o
+       -$(RM) ..\common\*.bak
+       -$(RM) ..\generic\*.o
+       -$(RM) ..\generic\*.bak
+       -$(RM) ..\html\*.o
+       -$(RM) ..\png\*.o
+       -$(RM) ..\png\*.bak
+       -$(RM) ..\zlib\*.o
+       -$(RM) ..\zlib\*.bak
+       -$(RM) ..\jpeg\*.o
+       -$(RM) ..\..\lib\libwx.a
 
 cleanall: clean

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 64eb490cc7b594948ad441a1bdfbb2f662606b73..240878775002a566427c5aba9542dce885460922 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -150,6 +150,10 @@ optimized. For example, in wxWindows project, set to 'Minimum
 Size'. In Dialog Editor project, set to 'Customize: Favor Small
 Code' (and no others). This will then work.
 
+Similarly, in VC++ 4, optimization can cause internal compiler
+errors, so edit src\makevc.env and change /O1 to /Od before
+trying build a release version of the library.
+
 Note (4): some crash problems can be due to inconsistent compiler
 options. If strange/weird/impossible things start to happen please
 check (dumping IDE project file as makefile and doing text comparison

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 1fa3f6b6e7fa12cd2d4fd461086ef4a8d61230ab..4ab8ec061ec68e8ffea2a25d844f3d8027e4208d 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -395,7 +395,7 @@ class wxGrid : public wxPanel
     void OnSize( wxSizeEvent& );
     void OnMouse( wxMouseEvent& );
     void OnKeyDown( wxKeyEvent& );
-    void OnText( wxKeyEvent& );
+    void OnText( wxCommandEvent& );
     void OnGridScroll( wxScrollEvent& );
 
     void SelectCell( const wxGridCellCoords& coords );

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 2f85221fd1638bf40c1b9ffb59ca3075299e1269..dcced22a41175e8ddef3eec9aa77cdedc150bec5 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1942,7 +1942,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& ev )
 // Text updated in an edit control - either a text control or a
 // combo box
 //
-void wxGrid::OnText( wxKeyEvent& ev )
+void wxGrid::OnText( wxCommandEvent& ev )
 {
     if ( !m_inOnText )
     {

diff --git a/src/makeg95.env b/src/makeg95.env
index d014e9d8271bf2d8315d8de976c9542f91bad8c6..f9def2d8360702b53aea032a92c391739ec44559 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -12,6 +12,9 @@ MINGW32=1
 # Set to the version you have
 MINGW32VERSION=2.95
 
+# Set to the appropriate remove command
+RM=rm -f 
+
 ########################## Compiler ##################################
 
 # C++ compiler

diff --git a/src/makelib.g95 b/src/makelib.g95
index de3e8c583c9a2777b229b7b571ec393bf6248102..462cff120d1c73f59fd151b70914a50cddd4e3f9 100644 (file)
--- a/src/makelib.g95
+++ b/src/makelib.g95
@@ -20,4 +20,4 @@ $(LIBTARGET): $(OBJECTS)
        $(RANLIB) $@
 
 clean:
-       rm -f $(OBJECTS) $(LIBTARGET) core *.rsc *.res
+       -$(RM) $(OBJECTS) $(LIBTARGET) core *.rsc *.res

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index fbe21342f660f26fc320c9f6ead9bd2ef394a5ed..4ded0d8261370c709b34e7f0871ae123b9482fc8 100644 (file)
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -20,9 +20,9 @@ $(TARGET)_resources.o:  $(TARGET).rc
        $(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
 
 clean:
-       rm -f *.o
-       rm -f $(TARGET)_resources.o
-       rm -f $(TARGET).exe 
-       rm -f core 
-       rm -f *.rsc
-       rm -f *.res
+       -$(RM) *.o
+       -$(RM) $(TARGET)_resources.o
+       -$(RM) $(TARGET).exe 
+       -$(RM) core 
+       -$(RM) *.rsc
+       -$(RM) *.res

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 0f6bdb3054d60685b0d7d5bffdcf46ed377fd9d3..2d575aa448877385c09d8603e79e5b9725d527fa 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -390,10 +390,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-       copy ..\common\dosyacc.c ..\common\y_tab.c
+       copy ..\\common\\dosyacc.c ..\\common\\y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-       copy ..\common\doslex.c ..\common\lex_yy.c
+       copy ..\\common\\doslex.c ..\\common\\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -426,21 +426,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
-       rm -f *.o
-       rm -f *.bak
-       rm -f core
-       rm -f ..\common\y_tab.c
-       rm -f ..\common\lex_yy.c
-       rm -f ..\common\*.o
-       rm -f ..\common\*.bak
-       rm -f ..\generic\*.o
-       rm -f ..\generic\*.bak
-       rm -f ..\html\*.o
-       rm -f ..\png\*.o
-       rm -f ..\png\*.bak
-       rm -f ..\zlib\*.o
-       rm -f ..\zlib\*.bak
-       rm -f ..\jpeg\*.o
-       rm -f ..\..\lib\libwx.a
+       -$(RM) *.o
+       -$(RM) *.bak
+       -$(RM) core
+       -$(RM) ..\common\y_tab.c
+       -$(RM) ..\common\lex_yy.c
+       -$(RM) ..\common\*.o
+       -$(RM) ..\common\*.bak
+       -$(RM) ..\generic\*.o
+       -$(RM) ..\generic\*.bak
+       -$(RM) ..\html\*.o
+       -$(RM) ..\png\*.o
+       -$(RM) ..\png\*.bak
+       -$(RM) ..\zlib\*.o
+       -$(RM) ..\zlib\*.bak
+       -$(RM) ..\jpeg\*.o
+       -$(RM) ..\..\lib\libwx.a
 
 cleanall: clean

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index aeb70b374d4b80e113d172a418af08383adf7758..51a32f9814e39f6302901224a97b08340a11bb1b 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -211,7 +211,7 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifndef __GNUWIN32__
 #if defined(__BORLANDC__) || defined(__WATCOMC__)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
-#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1000) && (__VISUALC__ < 1020)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 44c408406b6d03bb6d221ec415a45200bce43ba4..f1cfce1fd9ecb912ea83b5aeb8a0619fff8d4d05 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -318,7 +318,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 #if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
-#if !defined(__VISUALC__) || (__VISUALC__ != 1010)
+#if !defined(__VISUALC__) || (__VISUALC__ > 1010)
     if ( m_windowStyle & wxTR_MULTIPLE )
         wstyle |= TVS_CHECKBOXES;
 #endif