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

fixed bug introduced by my previous GtkUpdateSize() commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-06 13:14:27 +00:00
parent 8fde61ed10
commit 7b4c2a061b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/frame.cpp
View File

@@ -216,7 +216,7 @@ bool wxFrame::Create( wxWindow *parent,
long style, long style,
const wxString &name ) const wxString &name )
{ {
bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
style, name); style, name);
m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
return rt; return rt;
@@ -235,7 +235,7 @@ wxFrame::~wxFrame()
void wxFrame::DoGetClientSize( int *width, int *height ) const void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxTopLevelWindow::DoGetClientSize( width, height ); wxTopLevelWindow::DoGetClientSize( width, height );
if (height) if (height)
@@ -253,7 +253,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown()) if (m_frameStatusBar && m_frameStatusBar->IsShown())
(*height) -= wxSTATUS_HEIGHT; (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
@@ -443,7 +443,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
ww = m_width - 2*m_miniEdge; ww = m_width - 2*m_miniEdge;
hh = m_toolBarDetached ? wxPLACE_HOLDER hh = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_height; : m_frameToolBar->m_height;
client_area_y_offset += hh; client_area_y_offset += hh;
} }
@@ -485,7 +485,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
GtkUpdateSize(); m_sizeSet = TRUE;
// send size event to frame // send size event to frame
wxSizeEvent event( wxSize(m_width,m_height), GetId() ); wxSizeEvent event( wxSize(m_width,m_height), GetId() );

10
src/gtk1/frame.cpp
View File

@@ -216,7 +216,7 @@ bool wxFrame::Create( wxWindow *parent,
long style, long style,
const wxString &name ) const wxString &name )
{ {
bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
style, name); style, name);
m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
return rt; return rt;
@@ -235,7 +235,7 @@ wxFrame::~wxFrame()
void wxFrame::DoGetClientSize( int *width, int *height ) const void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxTopLevelWindow::DoGetClientSize( width, height ); wxTopLevelWindow::DoGetClientSize( width, height );
if (height) if (height)
@@ -253,7 +253,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown()) if (m_frameStatusBar && m_frameStatusBar->IsShown())
(*height) -= wxSTATUS_HEIGHT; (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
@@ -443,7 +443,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
ww = m_width - 2*m_miniEdge; ww = m_width - 2*m_miniEdge;
hh = m_toolBarDetached ? wxPLACE_HOLDER hh = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_height; : m_frameToolBar->m_height;
client_area_y_offset += hh; client_area_y_offset += hh;
} }
@@ -485,7 +485,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
GtkUpdateSize(); m_sizeSet = TRUE;
// send size event to frame // send size event to frame
wxSizeEvent event( wxSize(m_width,m_height), GetId() ); wxSizeEvent event( wxSize(m_width,m_height), GetId() );