(int)alloc->width,
(int)alloc->height );
*/
+
win->m_width = alloc->width;
win->m_height = alloc->height;
win->UpdateSize();
}
#endif
- wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle );
+ DoSetSize( -1, -1, width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0 );
}
void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
m_width = width;
m_height = height;
-
+
/* space occupied by m_frameToolBar and m_frameMenuBar */
int client_area_y_offset = 0;
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
-/*
// send size event to status bar
if (m_frameStatusBar)
{
event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
}
-*/
m_resizing = FALSE;
}
if (m_frameToolBar)
{
/* insert into toolbar area if not already there */
- if (m_frameToolBar->m_widget->parent != m_mainWidget)
+ if ((m_frameToolBar->m_widget->parent) &&
+ (m_frameToolBar->m_widget->parent != m_mainWidget))
{
- gtk_widget_ref( m_frameToolBar->m_widget );
- gtk_widget_unparent( m_frameToolBar->m_widget );
-
- m_insertInClientArea = TRUE;
- wxInsertChildInFrame( this, m_frameToolBar );
- m_insertInClientArea = FALSE;
-
- gtk_widget_unref( m_frameToolBar->m_widget );
+ GetChildren().DeleteObject( m_frameToolBar );
+
+ gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+ UpdateSize();
}
}
}