X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10199e27d54df4a0a2a7b2577645ce4561e8ed5f..345bdf13c073dde5f81ff8b91640232dd09445ee:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 7976e5cd15..1aba12cee7 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -7,9 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "notebook.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/notebook.h" @@ -20,12 +19,16 @@ #include "wx/imaglist.h" #include "wx/intl.h" #include "wx/log.h" +#include "wx/bitmap.h" +#include "wx/fontutil.h" -#include -#include +#include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" + #include +#include "wx/msgdlg.h" + // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- @@ -46,16 +49,6 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -//----------------------------------------------------------------------------- -// debug -//----------------------------------------------------------------------------- - -#ifdef __WXDEBUG__ - -extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); - -#endif - //----------------------------------------------------------------------------- // wxGtkNotebookPage //----------------------------------------------------------------------------- @@ -70,40 +63,41 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar class wxGtkNotebookPage: public wxObject { public: - wxGtkNotebookPage() - { - m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; - } - - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - GtkWidget *m_box; // in which the label and image are packed + wxGtkNotebookPage() + { + m_image = -1; + m_page = (GtkNotebookPage *) NULL; + m_box = (GtkWidget *) NULL; + } + + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + GtkWidget *m_box; // in which the label and image are packed }; + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGtkNotebookPagesList); +WX_DEFINE_LIST(wxGtkNotebookPagesList) + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- +extern "C" { static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), gint page, wxNotebook *notebook ) { - static bool s_inPageChange = FALSE; - // are you trying to call SetSelection() from a notebook event handler? // you shouldn't! - wxCHECK_RET( !s_inPageChange, + wxCHECK_RET( !notebook->m_inSwitchPage, _T("gtk_notebook_page_change_callback reentered") ); - s_inPageChange = TRUE; + notebook->m_inSwitchPage = TRUE; if (g_isIdle) wxapp_install_idle_handler(); @@ -133,13 +127,15 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), notebook->GetEventHandler()->ProcessEvent( eventChanged ); } - s_inPageChange = FALSE; + notebook->m_inSwitchPage = FALSE; +} } //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { if (g_isIdle) @@ -166,11 +162,13 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* gtk_widget_size_allocate( win->m_wxwindow, alloc ); } } +} //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- +extern "C" { static gint gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { @@ -183,35 +181,67 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) return FALSE; } +} //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- -static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +extern "C" { +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; + if (!notebook->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right)) + { + int page; + int nMax = notebook->GetPageCount(); + if ( nMax-- ) // decrement it to get the last valid index + { + int nSel = notebook->GetSelection(); + + // change selection wrapping if it becomes invalid + page = (gdk_event->keyval != GDK_Left) ? nSel == nMax ? 0 + : nSel + 1 + : nSel == 0 ? nMax + : nSel - 1; + } + else // notebook is empty, no next page + { + return FALSE; + } + + // m_selection = page; + gtk_notebook_set_page( GTK_NOTEBOOK(widget), page ); + + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } + /* win is a control: tab can be propagated up */ if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { - int sel = win->GetSelection(); - wxGtkNotebookPage *page = win->GetNotebookPage(sel); - wxCHECK_MSG( page, FALSE, _T("invalid selection in wxNotebook") ); + int sel = notebook->GetSelection(); + if (sel == -1) + return TRUE; + wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel); + wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; - event.SetEventObject( win ); + event.SetEventObject( notebook ); /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ event.SetDirection( (gdk_event->keyval == GDK_Tab) ); /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ - event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); - event.SetCurrentFocus( win ); + event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) || + (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) ); + event.SetCurrentFocus( notebook ); - wxNotebookPage *client = win->GetPage(sel); + wxNotebookPage *client = notebook->GetPage(sel); if ( !client->GetEventHandler()->ProcessEvent( event ) ) { client->SetFocus(); @@ -223,14 +253,27 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk return FALSE; } +} //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) +static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) { - /* we don't do anything here but pray */ + // Hack Alert! (Part I): This sets the notebook as the parent of the child + // widget, and takes care of some details such as updating the state and + // style of the child to reflect its new location. We do this early + // because without it GetBestSize (which is used to set the initial size + // of controls if an explicit size is not given) will often report + // incorrect sizes since the widget's style context is not fully known. + // See bug #901694 for details + // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863) + gtk_widget_set_parent(child->m_widget, parent->m_widget); + + // NOTE: This should be considered a temporary workaround until we can + // work out the details and implement delaying the setting of the initial + // size of widgets until the size is really needed. } //----------------------------------------------------------------------------- @@ -245,8 +288,10 @@ END_EVENT_TABLE() void wxNotebook::Init() { + m_padding = 0; + m_inSwitchPage = FALSE; + m_imageList = (wxImageList *) NULL; - m_pagesData.DeleteContents( TRUE ); m_selection = -1; m_themeEnabled = TRUE; } @@ -266,10 +311,6 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { - /* don't generate change page events any more */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); - DeleteAllPages(); } @@ -291,10 +332,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_notebook_new(); -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name ); -#endif - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", @@ -312,15 +349,11 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); - PostCreation(); - - SetFont( parent->GetFont() ); + PostCreation(size); gtk_signal_connect( GTK_OBJECT(m_widget), "realize", GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); - Show( TRUE ); - return TRUE; } @@ -330,9 +363,9 @@ int wxNotebook::GetSelection() const if ( m_selection == -1 ) { - GList *pages = GTK_NOTEBOOK(m_widget)->children; + GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; - if (g_list_length(pages) != 0) + if (g_list_length(nb_pages) != 0) { GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -340,7 +373,7 @@ int wxNotebook::GetSelection() const if ( cur != NULL ) { wxConstCast(this, wxNotebook)->m_selection = - g_list_index( pages, cur ); + g_list_index( nb_pages, cur ); } } } @@ -348,7 +381,7 @@ int wxNotebook::GetSelection() const return m_selection; } -wxString wxNotebook::GetPageText( int page ) const +wxString wxNotebook::GetPageText( size_t page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); @@ -359,7 +392,7 @@ wxString wxNotebook::GetPageText( int page ) const return wxT(""); } -int wxNotebook::GetPageImage( int page ) const +int wxNotebook::GetPageImage( size_t page ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); @@ -379,11 +412,11 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const return m_pagesData.Item(page)->GetData(); } -int wxNotebook::SetSelection( int page ) +int wxNotebook::SetSelection( size_t page ) { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); + wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); @@ -398,7 +431,7 @@ int wxNotebook::SetSelection( int page ) return selOld; } -bool wxNotebook::SetPageText( int page, const wxString &text ) +bool wxNotebook::SetPageText( size_t page, const wxString &text ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); @@ -408,12 +441,12 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) nb_page->m_text = text; - gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() ); + gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); return TRUE; } -bool wxNotebook::SetPageImage( int page, int image ) +bool wxNotebook::SetPageImage( size_t page, int image ) { /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ @@ -470,7 +503,7 @@ bool wxNotebook::SetPageImage( int page, int image ) wxASSERT( m_imageList != NULL ); /* Just in case */ /* Construct the new pixmap */ - const wxBitmap *bmp = m_imageList->GetBitmap(image); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(image); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -484,7 +517,7 @@ bool wxNotebook::SetPageImage( int page, int image ) pixmapwid = gtk_pixmap_new (pixmap, mask ); /* CHECKME: Are these pack flags okay? */ - gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } else @@ -503,9 +536,31 @@ void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } -void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) +void wxNotebook::SetPadding( const wxSize &padding ) { - wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); + + m_padding = padding.GetWidth(); + + int i; + for (i=0; im_image != -1) + { + // gtk_box_set_child_packing sets padding on BOTH sides + // icon provides left padding, label provides center and right + int image = nb_page->m_image; + SetPageImage(i,-1); + SetPageImage(i,image); + } + wxASSERT(nb_page->m_label); + gtk_box_set_child_packing(GTK_BOX(nb_page->m_box), + GTK_WIDGET(nb_page->m_label), + FALSE, FALSE, m_padding, GTK_PACK_END); + } } void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) @@ -522,29 +577,18 @@ bool wxNotebook::DeleteAllPages() wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - // GTK sets GtkNotebook.cur_page to NULL before sending the switch page - // event so we have to store the selection internally - if ( m_selection == -1 ) + if ( m_selection != -1 && (size_t)m_selection >= page ) { - m_selection = GetSelection(); - if ( m_selection == (int)m_pagesData.GetCount() - 1 ) - { - // the index will become invalid after the page is deleted - m_selection = -1; - } + // the index will become invalid after the page is deleted + m_selection = -1; } - // it will call our DoRemovePage() to do the real work - return wxNotebookBase::DeletePage(page); -} - -wxNotebookPage *wxNotebook::DoRemovePage( int page ) -{ wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); if ( !client ) return NULL; @@ -553,14 +597,25 @@ wxNotebookPage *wxNotebook::DoRemovePage( int page ) gtk_widget_unrealize( client->m_widget ); gtk_widget_unparent( client->m_widget ); + // gtk_notebook_remove_page() sends "switch_page" signal with some strange + // new page index (when deleting selected page 0, new page is 1 although, + // clearly, the selection should stay 0), so suppress this + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); + gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); - m_pagesData.DeleteObject(GetNotebookPage(page)); + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + + wxGtkNotebookPage* p = GetNotebookPage(page); + m_pagesData.DeleteObject(p); + delete p; return client; } -bool wxNotebook::InsertPage( int position, +bool wxNotebook::InsertPage( size_t position, wxNotebookPage* win, const wxString& text, bool select, @@ -571,10 +626,17 @@ bool wxNotebook::InsertPage( int position, wxCHECK_MSG( win->GetParent() == this, FALSE, wxT("Can't add a page whose parent is not the notebook!") ); - wxCHECK_MSG( position >= 0 && position <= GetPageCount(), FALSE, + wxCHECK_MSG( position <= GetPageCount(), FALSE, _T("invalid page index in wxNotebookPage::InsertPage()") ); - /* don't receive switch page during addition */ + // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback + // why this has to be done. NOTE: using gtk_widget_unparent here does not + // work as it seems to undo too much and will cause errors in the + // gtk_notebook_insert_page below, so instead just clear the parent by + // hand here. + win->m_widget->parent = NULL; + + // don't receive switch page during addition gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); @@ -583,36 +645,33 @@ bool wxNotebook::InsertPage( int position, GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxGtkNotebookPage *page = new wxGtkNotebookPage(); + wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); if ( position == GetPageCount() ) - m_pagesData.Append( page ); + m_pagesData.Append( nb_page ); else - m_pagesData.Insert( m_pagesData.Item( position ), page ); + m_pagesData.Insert( position, nb_page ); m_pages.Insert(win, position); - page->m_box = gtk_hbox_new( FALSE, 0 ); - gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 ); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); + gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); - if (position < 0) - gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); - else - gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position ); + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); - page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; + nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; /* set the label image */ - page->m_image = imageId; + nb_page->m_image = imageId; if (imageId != -1) { wxASSERT( m_imageList != NULL ); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -622,35 +681,116 @@ bool wxNotebook::InsertPage( int position, GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } /* set the label text */ - page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = wxT(""); - page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) ); - gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 ); + nb_page->m_text = text; + if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); - /* show the label */ - gtk_widget_show( GTK_WIDGET(page->m_label) ); + nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); + gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); + + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); + gtk_rc_style_unref(style); + } + /* show the label */ + gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); if (select && (m_pagesData.GetCount() > 1)) { - if (position < 0) - SetSelection( GetPageCount()-1 ); - else - SetSelection( position ); + SetSelection( position ); } gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + InvalidateBestSize(); return TRUE; } +// helper for HitTest(): check if the point lies inside the given widget which +// is the child of the notebook whose position and border size are passed as +// parameters +static bool +IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, + gint x, gint y, gint border = 0) +{ + return + (pt.x >= w->allocation.x - x - border) && + (pt.x <= w->allocation.x - x + border + w->allocation.width) && + (pt.y >= w->allocation.y - y - border) && + (pt.y <= w->allocation.y - y + border + w->allocation.height); +} + +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const +{ + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; + + const size_t count = GetPageCount(); + for ( size_t i = 0; i < count; i++ ) + { + wxGtkNotebookPage* nb_page = GetNotebookPage(i); + GtkWidget *box = nb_page->m_box; + + // VZ: don't know how to find the border width in GTK+ 1.2 +#ifdef __WXGTK20__ + const gint border = gtk_container_get_border_width(GTK_CONTAINER(box)); +#else // !GTK+ 2.x + const gint border = 0; +#endif + if ( IsPointInsideWidget(pt, box, x, y, border) ) + { + // ok, we're inside this tab -- now find out where, if needed + if ( flags ) + { + GtkWidget *pixmap = NULL; + + GList *children = gtk_container_children(GTK_CONTAINER(box)); + for ( GList *child = children; child; child = child->next ) + { + if ( GTK_IS_PIXMAP(child->data) ) + { + pixmap = GTK_WIDGET(child->data); + break; + } + } + + if ( children ) + g_list_free(children); + + if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) + { + *flags = wxNB_HITTEST_ONICON; + } + else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) + { + *flags = wxNB_HITTEST_ONLABEL; + } + else + { + *flags = wxNB_HITTEST_ONITEM; + } + } + + return i; + } + } + + if ( flags ) + *flags = wxNB_HITTEST_NOWHERE; + + return wxNOT_FOUND; +} + void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { if (event.IsWindowChange()) @@ -675,18 +815,25 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) #endif -void wxNotebook::ApplyWidgetStyle() +void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) { - // TODO, font for labels etc - - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_modify_style(m_widget, style); + size_t cnt = m_pagesData.GetCount(); + for (size_t i = 0; i < cnt; i++) + gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style); } bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) { return ((m_widget->window == window) || - (GTK_NOTEBOOK(m_widget)->panel == window)); + (NOTEBOOK_PANEL(m_widget) == window)); +} + +// static +wxVisualAttributes +wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } //-----------------------------------------------------------------------------