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

don't set resize mode to QUEUE, it seems to be wrong for a wxWindow in a native container

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-12-02 18:13:07 +00:00
parent e187c604ab
commit faeaa9db1c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gtk/win_gtk.cpp
View File

@@ -321,7 +321,6 @@ GtkWidget* wxPizza::New(long windowStyle)
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK); GDK_FOCUS_CHANGE_MASK);
gtk_container_set_resize_mode(GTK_CONTAINER(widget), GTK_RESIZE_QUEUE);
return widget; return widget;
} }

16
src/gtk/window.cpp
View File

@@ -2245,7 +2245,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
else else
{ {
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
gtk_container_set_resize_mode(GTK_CONTAINER(m_widget), GTK_RESIZE_QUEUE);
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
@@ -2911,19 +2910,16 @@ bool wxWindowGTK::Show( bool show )
return false; return false;
} }
if (show) if (show && m_showOnIdle)
{ {
if (!m_showOnIdle) // deferred
{
gtk_widget_show( m_widget );
wxShowEvent eventShow(GetId(), show);
eventShow.SetEventObject(this);
HandleWindowEvent(eventShow);
}
} }
else else
{ {
gtk_widget_hide( m_widget ); if (show)
gtk_widget_show(m_widget);
else
gtk_widget_hide(m_widget);
wxShowEvent eventShow(GetId(), show); wxShowEvent eventShow(GetId(), show);
eventShow.SetEventObject(this); eventShow.SetEventObject(this);
HandleWindowEvent(eventShow); HandleWindowEvent(eventShow);