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

Fixed gtk 1.0.6 floating subwindow bug.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-04-28 11:39:57 +00:00
parent 2e563988fb
commit f9a273cd71
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/window.cpp
View File

@@ -1598,7 +1598,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) ); m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) );
m_wxwindow = gtk_myfixed_new(); m_wxwindow = gtk_myfixed_new();
gtk_widget_show( m_wxwindow );
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
debug_focus_in( m_wxwindow, _T("wxWindow::m_wxwindow"), name ); 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 */ /* grab the actual focus */
// gtk_widget_grab_focus( m_wxwindow ); // gtk_widget_grab_focus( m_wxwindow );
gtk_widget_show( m_wxwindow );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
// shut the viewport up // 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) ); gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );

4
src/gtk1/window.cpp
View File

@@ -1598,7 +1598,6 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) ); m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) );
m_wxwindow = gtk_myfixed_new(); m_wxwindow = gtk_myfixed_new();
gtk_widget_show( m_wxwindow );
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
debug_focus_in( m_wxwindow, _T("wxWindow::m_wxwindow"), name ); 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 */ /* grab the actual focus */
// gtk_widget_grab_focus( m_wxwindow ); // gtk_widget_grab_focus( m_wxwindow );
gtk_widget_show( m_wxwindow );
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
// shut the viewport up // 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) ); gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );