From: Julian Smart Date: Sun, 31 Oct 1999 12:03:20 +0000 (+0000) Subject: Fixes for VC++ 4 compilation; fixed wxCommandEvent arg in grid.h; X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6474416b2ec2a63ebc28548733d93bbe5aded70d 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 11705b2128..95dad3b967 100644 --- 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 64eb490cc7..2408787750 100644 --- 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 1fa3f6b6e7..4ab8ec061e 100644 --- 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 2f85221fd1..dcced22a41 100644 --- 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 d014e9d827..f9def2d836 100644 --- 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 de3e8c583c..462cff120d 100644 --- 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 fbe21342f6..4ded0d8261 100644 --- 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 0f6bdb3054..2d575aa448 100644 --- 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 aeb70b374d..51a32f9814 100644 --- 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 44c408406b..f1cfce1fd9 100644 --- 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