X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5549fa6559b3e4fdb975df6b4abd253279ed5351..218847660e9d14a2348586120c88f56c49a4dae7:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 2eb7a24f51..a5363e40a9 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -149,7 +149,7 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNo if (g_blockEventsOnDrag) return FALSE; - if (!notebook->HasVMT()) return FALSE; + if (!notebook->m_hasVMT) return FALSE; /* this code makes jumping down from the handles of the notebooks to the actual items in the visible notebook page possible with @@ -267,9 +267,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); @@ -530,7 +528,7 @@ void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") ); } -void wxNotebook::SetTabSize(const wxSize& sz) +void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") ); } @@ -707,6 +705,12 @@ void wxNotebook::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); } +bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) +{ + return ((m_widget->window == window) || + (GTK_NOTEBOOK(m_widget)->panel == window)); +} + //----------------------------------------------------------------------------- // wxNotebookEvent //-----------------------------------------------------------------------------