Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC++ changes + makeproj additions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-05 16:09:10 +00:00
parent d331afb7c8
commit 658fb8e6c5
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/grid.cpp
View File

@@ -4338,7 +4338,7 @@ void wxGrid::SelectCol( int col, bool addToSelected )
void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{ {
int temp; int temp;
bool changed = false; bool changed = FALSE;
wxGridCellCoords updateTopLeft, updateBottomRight; wxGridCellCoords updateTopLeft, updateBottomRight;
if ( topRow > bottomRow ) if ( topRow > bottomRow )
@@ -4370,7 +4370,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
if (updateTopLeft.GetCol() > leftCol) if (updateTopLeft.GetCol() > leftCol)
updateTopLeft.SetCol(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) if (updateBottomRight.GetCol() < rightCol)
updateBottomRight.SetCol(rightCol); updateBottomRight.SetCol(rightCol);
} }
changed = true; changed = TRUE;
} }
if (changed) if (changed)

2
src/html/helpfrm.cpp
View File

@@ -924,7 +924,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
"</body></html>")); "</body></html>"));
} }
void OnUpdate(wxCloseEvent& event) void OnUpdate(wxCommandEvent& event)
{ {
UpdateTestWin(); UpdateTestWin();
} }

4
src/msw/dialup.cpp
View File

@@ -48,8 +48,8 @@
#include "wx/dialup.h" #include "wx/dialup.h"
// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h // Doesn't yet compile under VC++ 4, BC++, mingw, Watcom C++: no wininet.h
#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) #if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020))
#include <ras.h> #include <ras.h>
#include <raserror.h> #include <raserror.h>

6
utils/projgen/makeproj.cpp
View File

@@ -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 //// Utilities
// Dialog Editor // Dialog Editor