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

move widget resize handling from DoSetSize to DoMoveWindow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-04-19 17:15:40 +00:00
parent 0604cfd7b9
commit 01a49fd4c4
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/window.cpp
View File

@@ -2566,12 +2566,14 @@ bool wxWindowGTK::Destroy()
void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
{ {
GtkWidget* parent = gtk_widget_get_parent(m_widget);
if (WX_IS_PIZZA(parent))
{
WX_PIZZA(parent)->move(m_widget, x, y);
gtk_widget_set_size_request(m_widget, width, height); gtk_widget_set_size_request(m_widget, width, height);
}
// inform the parent to perform the move else
wxASSERT_MSG(m_parent && m_parent->m_wxwindow, gtk_widget_queue_resize(m_widget);
"the parent window has no client area?");
WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
} }
void wxWindowGTK::ConstrainSize() void wxWindowGTK::ConstrainSize()
@@ -2593,8 +2595,7 @@ void wxWindowGTK::ConstrainSize()
void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags ) void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); wxCHECK_RET(m_widget, "invalid window");
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
int scrollX = 0, scrollY = 0; int scrollX = 0, scrollY = 0;
GtkWidget* parent = gtk_widget_get_parent(m_widget); GtkWidget* parent = gtk_widget_get_parent(m_widget);
@@ -2636,10 +2637,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
m_y = y; m_y = y;
m_width = width; m_width = width;
m_height = height; m_height = height;
}
if (m_parent->m_wxwindow)
{
/* the default button has a border around it */ /* the default button has a border around it */
if (gtk_widget_get_can_default(m_widget)) if (gtk_widget_get_can_default(m_widget))
{ {
@@ -2658,16 +2656,12 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
DoMoveWindow(x, y, width, height); DoMoveWindow(x, y, width, height);
} }
if (sizeChange) if ((sizeChange && !m_nativeSizeEvent) || (sizeFlags & wxSIZE_FORCE_EVENT))
{ {
// update these variables to keep size_allocate handler // update these variables to keep size_allocate handler
// from sending another size event for this change // from sending another size event for this change
GetClientSize( &m_oldClientWidth, &m_oldClientHeight ); GetClientSize( &m_oldClientWidth, &m_oldClientHeight );
gtk_widget_queue_resize(m_widget);
}
if ((sizeChange && !m_nativeSizeEvent) || (sizeFlags & wxSIZE_FORCE_EVENT))
{
wxSizeEvent event( wxSize(m_width,m_height), GetId() ); wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this ); event.SetEventObject( this );
HandleWindowEvent( event ); HandleWindowEvent( event );