From: Karsten Ballüder Date: Wed, 28 Apr 1999 11:39:57 +0000 (+0000) Subject: Fixed gtk 1.0.6 floating subwindow bug. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f9a273cd715d1cc2f8fa61b5f44814da47f53731 Fixed gtk 1.0.6 floating subwindow bug. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 4fb6cdc1c9..a9b05116b3 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1598,7 +1598,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) ); m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); #ifdef __WXDEBUG__ debug_focus_in( m_wxwindow, _T("wxWindow::m_wxwindow"), name ); @@ -1654,6 +1653,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, /* grab the actual focus */ // gtk_widget_grab_focus( m_wxwindow ); + gtk_widget_show( m_wxwindow ); + + #if (GTK_MINOR_VERSION == 0) // shut the viewport up gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 4fb6cdc1c9..a9b05116b3 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1598,7 +1598,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) ); m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); #ifdef __WXDEBUG__ debug_focus_in( m_wxwindow, _T("wxWindow::m_wxwindow"), name ); @@ -1654,6 +1653,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, /* grab the actual focus */ // gtk_widget_grab_focus( m_wxwindow ); + gtk_widget_show( m_wxwindow ); + + #if (GTK_MINOR_VERSION == 0) // shut the viewport up gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );