X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index bbfd78056a..0b95ed355e 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -1,444 +1,569 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "notebook.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_NOTEBOOK #include "wx/notebook.h" -#include "wx/panel.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" + #include "wx/bitmap.h" +#endif + #include "wx/imaglist.h" -#include "wx/intl.h" -#include "wx/log.h" +#include "wx/fontutil.h" + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// wxNotebookPage +// wxGtkNotebookPage //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +// VZ: this is rather ugly as we keep the pages themselves in an array (it +// allows us to have quite a few functions implemented in the base class) +// but the page data is kept in a separate list, so we must maintain them +// in sync manually... of course, the list had been there before the base +// class which explains it but it still would be nice to do something +// about this one day + +class wxGtkNotebookPage: public wxObject { public: - wxNotebookPage() - { - m_id = -1; - m_text = ""; - m_image = -1; - m_page = NULL; - m_client = NULL; - m_parent = NULL; - } - -//private: - int m_id; - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - wxWindow *m_client; - GtkNotebook *m_parent; + GtkWidget* m_box; + GtkWidget* m_label; + GtkWidget* m_image; + int m_imageIndex; }; + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxGtkNotebookPagesList) + +extern "C" { +static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*); +} + //----------------------------------------------------------------------------- -// GTK callbacks +// "switch_page" //----------------------------------------------------------------------------- -// page change callback -static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *WXUNUSED(page), - gint nPage, - gpointer data) +extern "C" { +static void +switch_page_after(GtkWidget* widget, GtkNotebookPage*, guint, wxNotebook* win) { - wxNotebook *notebook = (wxNotebook *)data; - - int nOld = notebook->GetSelection(); - - // TODO: emulate PAGE_CHANGING event - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), - nPage, - nOld); - event.SetEventObject(notebook); - notebook->ProcessEvent(event); + g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win); + win->SendPageChangedEvent(win->m_oldSelection); +} } -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) +extern "C" { +static void +switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win) { - if ( win->GetAutoLayout() ) - win->Layout(); + win->m_oldSelection = gtk_notebook_get_current_page(widget); + + if (win->SendPageChangingEvent(page)) + // allow change, unblock handler for changed event + g_signal_handlers_unblock_by_func(widget, (void*)switch_page_after, win); + else + // change vetoed, unblock handler to set selection back + g_signal_handlers_unblock_by_func(widget, (void*)event_after, win); +} +} - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } +//----------------------------------------------------------------------------- +// "event_after" from m_widget +//----------------------------------------------------------------------------- -/* - printf( "OnResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( " .\n" ); +extern "C" { +static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win) +{ + g_signal_handlers_block_by_func(widget, (void*)event_after, win); + g_signal_handlers_block_by_func(widget, (void*)switch_page, win); - printf( " Old: X: %d Y: %d ", win->m_x, win->m_y ); - printf( " W: %d H: %d ", win->m_width, win->m_height ); - printf( " .\n" ); + // restore previous selection + gtk_notebook_set_current_page(widget, win->m_oldSelection); - printf( " New: X: %d Y: %d ", alloc->x, alloc->y ); - printf( " W: %d H: %d ", alloc->width, alloc->height ); - printf( " .\n" ); -*/ + g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win); +} +} - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); +//----------------------------------------------------------------------------- +// InsertChild callback for wxNotebook +//----------------------------------------------------------------------------- -/* - printf( " Res: X: %d Y: %d ", win->m_x, win->m_y ); - printf( " W: %d H: %d ", win->m_width, win->m_height ); - printf( " .\n" ); -*/ +static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) +{ + // 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. } //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase) + +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) + EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) +END_EVENT_TABLE() void wxNotebook::Init() { - m_imageList = NULL; - m_pages.DeleteContents( TRUE ); - m_idHandler = 0; + m_padding = 0; + m_oldSelection = -1; + m_themeEnabled = true; } wxNotebook::wxNotebook() { - Init(); + Init(); } wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - Init(); - Create( parent, id, pos, size, style, name ); + Init(); + Create( parent, id, pos, size, style, name ); } wxNotebook::~wxNotebook() { - // don't generate change page events any more - if ( m_idHandler != 0 ) - gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler); - - DeleteAllPages(); + DeleteAllPages(); } bool wxNotebook::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name ) { - m_needParent = TRUE; + m_insertCallback = wxInsertChildInNotebook; - PreCreation( parent, id, pos, size, style, name ); + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + style |= wxBK_TOP; - m_widget = gtk_notebook_new(); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxNoteBook creation failed") ); + return false; + } - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - m_idHandler = gtk_signal_connect - ( - GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), - (gpointer)this - ); + m_widget = gtk_notebook_new(); - PostCreation(); + gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - Show( TRUE ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK(switch_page), this); - return TRUE; -} + g_signal_connect_after (m_widget, "switch_page", + G_CALLBACK(switch_page_after), this); + g_signal_handlers_block_by_func(m_widget, (void*)switch_page_after, this); -int wxNotebook::GetSelection() const -{ - if (m_pages.Number() == 0) - return -1; + g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this); + g_signal_handlers_block_by_func(m_widget, (void*)event_after, this); - GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page; + m_parent->DoAddChild( this ); - wxNotebookPage *page = NULL; + if (m_windowStyle & wxBK_RIGHT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); + if (m_windowStyle & wxBK_LEFT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); + if (m_windowStyle & wxBK_BOTTOM) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if (page->m_page == g_page) - break; - node = node->Next(); - } + PostCreation(size); - wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" ); - - return page->m_id; + return true; } -int wxNotebook::GetPageCount() const +int wxNotebook::GetSelection() const { - return m_pages.Number(); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + + return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) ); } -int wxNotebook::GetRowCount() const +wxString wxNotebook::GetPageText( size_t page ) const { - return 1; + wxCHECK_MSG(page < GetPageCount(), wxEmptyString, "invalid notebook index"); + + GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label); + return wxGTK_CONV_BACK(gtk_label_get_text(label)); } -wxString wxNotebook::GetPageText( int page ) const +int wxNotebook::GetPageImage( size_t page ) const { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_text; - else - return ""; + wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index"); + + return GetNotebookPage(page)->m_imageIndex; } -int wxNotebook::GetPageImage( int page ) const +wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_image; - else - return 0; + return m_pagesData.Item(page)->GetData(); } -wxNotebookPage* wxNotebook::GetNotebookPage(int page) const +int wxNotebook::DoSetSelection( size_t page, int flags ) { - wxNotebookPage *nb_page = NULL; - - wxNode *node = m_pages.First(); - while (node) - { - nb_page = (wxNotebookPage*)node->Data(); - if (nb_page->m_id == page) - return nb_page; - node = node->Next(); - } - - wxLogDebug( "Notebook page %d not found!", page ); + wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index"); - return NULL; -} + int selOld = GetSelection(); -int wxNotebook::SetSelection( int page ) -{ - int selOld = GetSelection(); - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return -1; + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this); + } - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) - { - if (nb_page->m_page == (GtkNotebookPage*)child->data) - break; - page_num++; - child = child->next; - } + gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); - if (!child) return -1; + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this); + } - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); + wxNotebookPage *client = GetPage(page); + if ( client ) + client->SetFocus(); - return selOld; + return selOld; } -void wxNotebook::AdvanceSelection(bool bForward) +bool wxNotebook::SetPageText( size_t page, const wxString &text ) { - int nSel = GetSelection(), - nMax = GetPageCount(); + wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index"); - if ( bForward ) { - SetSelection(nSel == nMax ? 0 : nSel + 1); - } - else { - SetSelection(nSel == 0 ? nMax : nSel - 1); - } -} + GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label); + gtk_label_set_text(label, wxGTK_CONV(text)); -void wxNotebook::SetImageList( wxImageList* imageList ) -{ - m_imageList = imageList; + return true; } -bool wxNotebook::SetPageText( int page, const wxString &text ) +bool wxNotebook::SetPageImage( size_t page, int image ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return FALSE; - - nb_page->m_text = text; - - return TRUE; + wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index"); + + wxGtkNotebookPage* pageData = GetNotebookPage(page); + if (image >= 0) + { + wxCHECK_MSG(m_imageList, false, "invalid notebook imagelist"); + const wxBitmap* bitmap = m_imageList->GetBitmapPtr(image); + if (bitmap == NULL) + return false; + if (pageData->m_image) + { + gtk_image_set_from_pixbuf( + GTK_IMAGE(pageData->m_image), bitmap->GetPixbuf()); + } + else + { + pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf()); + gtk_widget_show(pageData->m_image); + gtk_box_pack_start(GTK_BOX(pageData->m_box), + pageData->m_image, false, false, m_padding); + } + } + else if (pageData->m_image) + { + gtk_widget_destroy(pageData->m_image); + pageData->m_image = NULL; + } + pageData->m_imageIndex = image; + + return true; } -bool wxNotebook::SetPageImage( int page, int image ) +void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return FALSE; - - nb_page->m_image = image; - - return TRUE; + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } -void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) +void wxNotebook::SetPadding( const wxSize &padding ) { - wxFAIL_MSG(_("wxNotebook::SetPageSize not implemented")); + wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); + + m_padding = padding.GetWidth(); + + for (size_t i = GetPageCount(); i--;) + { + wxGtkNotebookPage* pageData = GetNotebookPage(i); + if (pageData->m_image) + { + gtk_box_set_child_packing(GTK_BOX(pageData->m_box), + pageData->m_image, false, false, m_padding, GTK_PACK_START); + } + gtk_box_set_child_packing(GTK_BOX(pageData->m_box), + pageData->m_label, false, false, m_padding, GTK_PACK_END); + } } -void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) +void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { - wxFAIL_MSG(_("wxNotebook::SetPadding not implemented")); + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); } bool wxNotebook::DeleteAllPages() { - wxNode *page_node = m_pages.First(); - while (page_node) - { - wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); - - DeletePage( page->m_id ); + for (size_t i = GetPageCount(); i--;) + DeletePage(i); - page_node = m_pages.First(); - } - - return TRUE; + return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; - - int page_num = 0; - GList *child = GTK_NOTEBOOK(m_widget)->children; - while (child) - { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; - page_num++; - child = child->next; - } - - wxASSERT( child ); - - delete nb_page->m_client; - -// Amazingly, this is not necessary -// gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); - - m_pages.DeleteObject( nb_page ); - - return TRUE; + // We cannot remove the page yet, as GTK sends the "switch_page" + // signal before it has removed the notebook-page from its + // corresponding list. Thus, if we were to remove the page from + // m_pages at this point, the two lists of pages would be out + // of sync during the PAGE_CHANGING/PAGE_CHANGED events. + wxNotebookPage *client = GetPage(page); + if ( !client ) + return NULL; + + gtk_widget_ref( client->m_widget ); + gtk_widget_unrealize( client->m_widget ); + + // we don't need to unparent the client->m_widget; GTK+ will do + // that for us (and will throw a warning if we do it!) + gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); + + // It's safe to remove the page now. + wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete")); + wxNotebookBase::DoRemovePage(page); + + wxGtkNotebookPage* p = GetNotebookPage(page); + m_pagesData.DeleteObject(p); + delete p; + + return client; } -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, - bool bSelect, int imageId) +bool wxNotebook::InsertPage( size_t position, + wxNotebookPage* win, + const wxString& text, + bool select, + int imageId ) { - // we've created the notebook page in AddChild(). Now we just have to set - // the caption for the page and set the others parameters. - - // first, find the page - wxNotebookPage *page = NULL; - - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if ( page->m_client == win ) - break; // found - node = node->Next(); - } - - wxCHECK_MSG(page != NULL, FALSE, - _("Can't add a page whose parent is not the notebook!")); - - // then set the attributes - page->m_text = text; - if ( page->m_text.IsEmpty() ) - page->m_text = ""; - page->m_image = imageId; - gtk_label_set(page->m_label, page->m_text); - - if ( bSelect ) { - SetSelection(GetPageCount()); - } - - return TRUE; + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); + + wxCHECK_MSG( win->GetParent() == this, false, + wxT("Can't add a page whose parent is not the notebook!") ); + + wxCHECK_MSG( position <= GetPageCount(), false, + _T("invalid page index in wxNotebookPage::InsertPage()") ); + + // 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; + + if (m_themeEnabled) + win->SetThemeEnabled(true); + + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); + + wxGtkNotebookPage* pageData = new wxGtkNotebookPage; + + m_pages.Insert(win, position); + m_pagesData.Insert(position, pageData); + + // set the label image and text + // this must be done before adding the page, as GetPageText + // and GetPageImage will otherwise return wrong values in + // the page-changed event that results from inserting the + // first page. + pageData->m_imageIndex = imageId; + + pageData->m_box = gtk_hbox_new(false, 1); + gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2); + + pageData->m_image = NULL; + if (imageId != -1) + { + if (m_imageList) + { + const wxBitmap* bitmap = m_imageList->GetBitmapPtr(imageId); + pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf()); + gtk_box_pack_start(GTK_BOX(pageData->m_box), + pageData->m_image, false, false, m_padding); + } + else + wxFAIL_MSG("invalid notebook imagelist"); + } + + /* set the label text */ + pageData->m_label = gtk_label_new(wxGTK_CONV(wxStripMenuCodes(text))); + gtk_box_pack_end(GTK_BOX(pageData->m_box), + pageData->m_label, false, false, m_padding); + + gtk_widget_show_all(pageData->m_box); + gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position); + + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(pageData->m_label, style); + gtk_rc_style_unref(style); + } + + if (select && GetPageCount() > 1) + { + SetSelection( position ); + } + + InvalidateBestSize(); + return true; } -wxWindow *wxNotebook::GetPage( int page ) const +// 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) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return NULL; - else - return nb_page->m_client; + 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); } -void wxNotebook::AddChild( wxWindow *win ) +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { - m_children.Append(win); - - wxNotebookPage *page = new wxNotebookPage(); + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; + + const size_t count = GetPageCount(); + size_t i = 0; + + GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); + if (gtk_notebook_get_scrollable(notebook)) + i = g_list_position( notebook->children, notebook->first_tab ); + + for ( ; i < count; i++ ) + { + wxGtkNotebookPage* pageData = GetNotebookPage(i); + GtkWidget* box = pageData->m_box; + + const gint border = gtk_container_get_border_width(GTK_CONTAINER(box)); + + if ( IsPointInsideWidget(pt, box, x, y, border) ) + { + // ok, we're inside this tab -- now find out where, if needed + if ( flags ) + { + if (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y)) + { + *flags = wxBK_HITTEST_ONICON; + } + else if (IsPointInsideWidget(pt, pageData->m_label, x, y)) + { + *flags = wxBK_HITTEST_ONLABEL; + } + else + { + *flags = wxBK_HITTEST_ONITEM; + } + } + + return i; + } + } + + if ( flags ) + { + *flags = wxBK_HITTEST_NOWHERE; + wxWindowBase * page = GetCurrentPage(); + if ( page ) + { + // rect origin is in notebook's parent coordinates + wxRect rect = page->GetRect(); + + // adjust it to the notebook's coordinates + wxPoint pos = GetPosition(); + rect.x -= pos.x; + rect.y -= pos.y; + if ( rect.Contains( pt ) ) + *flags |= wxBK_HITTEST_ONPAGE; + } + } + + return wxNOT_FOUND; +} - page->m_id = GetPageCount(); - page->m_label = (GtkLabel *)gtk_label_new(_("Handle")); - page->m_client = win; - gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, - (GtkWidget *)page->m_label); - gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); +void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) +{ + if (event.IsWindowChange()) + AdvanceSelection( event.GetDirection() ); + else + event.Skip(); +} - page->m_page = - (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); +#if wxUSE_CONSTRAINTS - page->m_parent = GTK_NOTEBOOK(m_widget); +// override these 2 functions to do nothing: everything is done in OnSize +void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) +{ + // don't set the sizes of the pages - their correct size is not yet known + wxControl::SetConstraintSizes(false); +} - gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); +bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) +{ + return true; +} - if (!page->m_page) - { - wxLogFatalError( _("Notebook page creation error") ); - return; - } +#endif - m_pages.Append( page ); +void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); + for (size_t i = GetPageCount(); i--;) + gtk_widget_modify_style(GetNotebookPage(i)->m_label, style); } -// override these 2 functions to do nothing: everything is done in OnSize -void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) +GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - // don't set the sizes of the pages - their correct size is not yet known - wxControl::SetConstraintSizes(FALSE); + windows.push_back(m_widget->window); + windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); + + return NULL; } -bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) +// static +wxVisualAttributes +wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return TRUE; + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } -//----------------------------------------------------------------------------- -// wxNotebookEvent -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) +#endif