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
This commit is contained in:
@@ -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
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user