From eff56bb979755ab7d6617f2814f542a21eda2aeb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 28 May 2000 21:45:00 +0000 Subject: [PATCH] 1. added missing const's to wxGrid::CalcXXX(wxRegion& r) fixing compilation 2. put frames with parent into wxTopLevelWindows too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/grid.h | 6 +++--- src/generic/grid.cpp | 6 +++--- src/msw/frame.cpp | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 4aa428b9f6..9bc02ce26b 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -982,10 +982,10 @@ public: // ------ display update functions // - void CalcRowLabelsExposed( wxRegion& reg ); + void CalcRowLabelsExposed( const wxRegion& reg ); - void CalcColLabelsExposed( wxRegion& reg ); - void CalcCellsExposed( wxRegion& reg ); + void CalcColLabelsExposed( const wxRegion& reg ); + void CalcCellsExposed( const wxRegion& reg ); // ------ event handlers diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index de2436cbc0..fc43074d6d 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -3791,7 +3791,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } -void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) +void wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -3840,7 +3840,7 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcColLabelsExposed( wxRegion& reg ) +void wxGrid::CalcColLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -3889,7 +3889,7 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcCellsExposed( wxRegion& reg ) +void wxGrid::CalcCellsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 1724d6d0f3..bbf1b76ccd 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -148,8 +148,7 @@ bool wxFrame::Create(wxWindow *parent, if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0) parent = NULL; - if (!parent) - wxTopLevelWindows.Append(this); + wxTopLevelWindows.Append(this); MSWCreate(m_windowId, parent, wxFrameClassName, this, title, x, y, width, height, style);