Resize fine tuning
thread_list no longer keyed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -285,8 +285,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
gtk_widget_set_usize( m_widget, m_width, m_height );
|
||||
}
|
||||
|
||||
m_sizeSet = TRUE;
|
||||
|
||||
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
|
||||
event.SetEventObject( this );
|
||||
GetEventHandler()->ProcessEvent( event );
|
||||
@@ -368,7 +366,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
|
||||
gtk_widget_set_usize( m_widget, m_width, m_height );
|
||||
|
||||
// This emulates the new wxMSW behaviour
|
||||
|
||||
|
||||
if (m_frameMenuBar)
|
||||
{
|
||||
m_frameMenuBar->m_x = 1;
|
||||
@@ -454,7 +452,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
|
||||
// yes: set it's size to fill all the frame
|
||||
int client_x, client_y;
|
||||
GetClientSize( &client_x, &client_y );
|
||||
child->SetSize( 1, 1, client_x-2, client_y);
|
||||
child->SetSize( 1, 1, client_x-2, client_y-2 );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -495,6 +493,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
|
||||
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
|
||||
}
|
||||
}
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
}
|
||||
|
||||
wxMenuBar *wxFrame::GetMenuBar(void) const
|
||||
@@ -511,6 +511,8 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
|
||||
m_frameToolBar = OnCreateToolBar( style, id, name );
|
||||
|
||||
GetChildren()->DeleteObject( m_frameToolBar );
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
|
||||
return m_frameToolBar;
|
||||
}
|
||||
@@ -533,6 +535,8 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
|
||||
|
||||
m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
|
||||
return m_frameStatusBar;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user