From 658fb8e6c5952b13e22da0c720573be7a01724f1 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 5 Feb 2000 16:09:10 +0000 Subject: [PATCH] VC++ changes + makeproj additions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 6 +++--- src/html/helpfrm.cpp | 2 +- src/msw/dialup.cpp | 4 ++-- utils/projgen/makeproj.cpp | 6 ++++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 21fed2866e..7b119c6572 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -4338,7 +4338,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) { int temp; - bool changed = false; + bool changed = FALSE; wxGridCellCoords updateTopLeft, updateBottomRight; if ( topRow > bottomRow ) @@ -4370,7 +4370,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) if (updateTopLeft.GetCol() > leftCol) updateTopLeft.SetCol(leftCol); } - changed = true; + changed = TRUE; } updateBottomRight = m_selectedBottomRight; @@ -4388,7 +4388,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) if (updateBottomRight.GetCol() < rightCol) updateBottomRight.SetCol(rightCol); } - changed = true; + changed = TRUE; } if (changed) diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 0df2ab25b7..5464a318fc 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -924,7 +924,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog "")); } - void OnUpdate(wxCloseEvent& event) + void OnUpdate(wxCommandEvent& event) { UpdateTestWin(); } diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index c23defa839..face5501d1 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -48,8 +48,8 @@ #include "wx/dialup.h" -// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h -#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) +// Doesn't yet compile under VC++ 4, BC++, mingw, Watcom C++: no wininet.h +#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020)) #include #include diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index fa31ef45b6..d4ad5de116 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -304,6 +304,12 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("PoemVC", "wxpoem", dir + wxString("/demos/poem"), wxStringList("wxpoem.cpp", "wxpoem.h", 0)); + GenerateSample("DbbrowseVC", "dbbrowse", dir + wxString("/demos/dbbrowse"), + wxStringList("dbbrowse.cpp", "browsedb.cpp", "dbgrid.cpp", "dbtree.cpp", "dlguser.cpp", "doc.cpp", + "pgmctrl.cpp", "tabpgwin.cpp", + "dbbrowse.h", "browsedb.h", "dbgrid.h", "dbtree.h", "dlguser.h", "doc.h", "pgmctrl.h", "std.h", "tabpgwin.h", + 0)); + //// Utilities // Dialog Editor -- 2.45.2