VC++ changes + makeproj additions

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 21fed2866edfd29c189328e75d8002a9999563cd..7b119c657207f6f381dca3a54c84a0a84c3f07ca 100644 (file)
--- 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;
 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 )
     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);
         }
             if (updateTopLeft.GetCol() > leftCol)
               updateTopLeft.SetCol(leftCol);
         }

-        changed = true;
+        changed = TRUE;

     }
 
     updateBottomRight = m_selectedBottomRight;
     }
 
     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);
         }
             if (updateBottomRight.GetCol() < rightCol)
                 updateBottomRight.SetCol(rightCol);
         }

-        changed = true;
+        changed = TRUE;

     }
 
     if (changed)
     }
 
     if (changed)

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 0df2ab25b733c982f2101d82ccd600d1f78d61bd..5464a318fc246f1d1a5b5097c0b841184b065b2b 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -924,7 +924,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                                    "</body></html>"));
             }
 
                                    "</body></html>"));
             }
 

-        void OnUpdate(wxCloseEvent& event)
+        void OnUpdate(wxCommandEvent& event)

             {
                 UpdateTestWin();
             }
             {
                 UpdateTestWin();
             }

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index c23defa8395674cf35c99f0ebab828fbecdc7567..face5501d171214e7db5fb24ad84cbbd389fbf35 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -48,8 +48,8 @@
 
 #include "wx/dialup.h"
 
 
 #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 <ras.h>
 #include <raserror.h>
 
 #include <ras.h>
 #include <raserror.h>

diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp
index fa31ef45b65d6da6a4f4c014897f362796605e67..d4ad5de11656b9e3bd6ffc7a761bf4aefdc34160 100644 (file)
--- 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("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
     //// Utilities
 
     // Dialog Editor