X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc4caa60a5b6c4af27da67afed5eeb85a823003..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 91114c0491..71ebdcf3a9 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -1,57 +1,32 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "notebook.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" -#if wxUSE_NOTEBOOK +#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/panel.h" -#include "wx/utils.h" #include "wx/imaglist.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" +#include #include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" - -#include - -#include "wx/msgdlg.h" - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // wxGtkNotebookPage @@ -67,216 +42,100 @@ extern bool g_blockEventsOnDrag; class wxGtkNotebookPage: public wxObject { public: - wxGtkNotebookPage() - { - m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; - } - - bool SetFont(const wxFont& font); - - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - GtkWidget *m_box; // in which the label and image are packed + GtkWidget* m_box; + GtkWidget* m_label; + GtkWidget* m_image; + int m_imageIndex; }; -bool wxGtkNotebookPage::SetFont(const wxFont& font) -{ - if (!m_label) - return false; - -#ifdef __WXGTK20__ - gtk_widget_modify_font(GTK_WIDGET(m_label), - font.GetNativeFontInfo()->description); -#else - GtkRcStyle *style = gtk_rc_style_new(); - style->fontset_name = - g_strdup(font.GetNativeFontInfo()->GetXFontName().c_str()); - gtk_widget_modify_style(GTK_WIDGET(m_label), style); - gtk_rc_style_unref(style); -#endif - - return true; -} - - #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGtkNotebookPagesList); +WX_DEFINE_LIST(wxGtkNotebookPagesList) +extern "C" { +static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*); +} //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- -static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *WXUNUSED(page), - gint page, - wxNotebook *notebook ) +extern "C" { +static void +switch_page_after(GtkNotebook* widget, GtkNotebookPage*, guint, wxNotebook* win) { - // are you trying to call SetSelection() from a notebook event handler? - // you shouldn't! - wxCHECK_RET( !notebook->m_inSwitchPage, - _T("gtk_notebook_page_change_callback reentered") ); - - notebook->m_inSwitchPage = TRUE; - if (g_isIdle) - wxapp_install_idle_handler(); - - int old = notebook->GetSelection(); - - wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, - notebook->GetId(), page, old ); - eventChanging.SetEventObject( notebook ); - - if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) && - !eventChanging.IsAllowed() ) - { - /* program doesn't allow the page change */ - gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), - "switch_page" ); - } - else // change allowed - { - // make wxNotebook::GetSelection() return the correct (i.e. consistent - // with wxNotebookEvent::GetSelection()) value even though the page is - // not really changed in GTK+ - notebook->m_selection = page; - - wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), page, old ); - eventChanged.SetEventObject( notebook ); - notebook->GetEventHandler()->ProcessEvent( eventChanged ); - } + g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win); - notebook->m_inSwitchPage = FALSE; + win->GTKOnPageChanged(); } - -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- - -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - - /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate - here in order to make repositioning after resizing to take effect. */ - if ((gtk_major_version == 1) && - (gtk_minor_version == 2) && - (gtk_micro_version < 6) && - (win->m_wxwindow) && - (GTK_WIDGET_REALIZED(win->m_wxwindow))) - { - gtk_widget_size_allocate( win->m_wxwindow, alloc ); - } } -//----------------------------------------------------------------------------- -// "realize" from m_widget -//----------------------------------------------------------------------------- - -static gint -gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) +extern "C" { +static void +switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win) { - if (g_isIdle) - wxapp_install_idle_handler(); - - /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize - here in order to make repositioning before showing to take effect. */ - gtk_widget_queue_resize( win->m_widget ); + win->m_oldSelection = gtk_notebook_get_current_page(widget); - return FALSE; + 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); +} } //----------------------------------------------------------------------------- -// "key_press_event" +// "event_after" from m_widget //----------------------------------------------------------------------------- -static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +extern "C" { +static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win) { - if (g_isIdle) - wxapp_install_idle_handler(); + g_signal_handlers_block_by_func(widget, (void*)event_after, win); + g_signal_handlers_block_by_func(widget, (void*)switch_page, win); - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; + // restore previous selection + gtk_notebook_set_current_page(widget, win->m_oldSelection); - /* 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(); - if (sel == -1) - return TRUE; - wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel); - wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); - - wxNavigationKeyEvent event; - event.SetEventObject( win ); - /* 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 ); - - wxNotebookPage *client = win->GetPage(sel); - if ( !client->GetEventHandler()->ProcessEvent( event ) ) - { - client->SetFocus(); - } - - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); - return TRUE; - } - - return FALSE; + g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win); +} } //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) +void wxNotebook::AddChildGTK(wxWindowGTK* child) { - // Hack alert! We manually set the child window - // parent field so that GTK can query the - // notebook's style and font. Without that, GetBestSize could return - // incorrect size, see bug #901694 for details + // 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) - child->m_widget->parent = parent->m_widget; + gtk_widget_set_parent(child->m_widget, 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) - -BEGIN_EVENT_TABLE(wxNotebook, wxControl) +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() void wxNotebook::Init() { m_padding = 0; - m_inSwitchPage = FALSE; - - m_imageList = (wxImageList *) NULL; - m_selection = -1; - m_themeEnabled = TRUE; + m_oldSelection = -1; + m_themeEnabled = true; } wxNotebook::wxNotebook() @@ -301,111 +160,92 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + style |= wxBK_TOP; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxNoteBook creation failed") ); - return FALSE; + return false; } m_widget = gtk_notebook_new(); + g_object_ref(m_widget); gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK(switch_page), this); + + 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); + + g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this); + g_signal_handlers_block_by_func(m_widget, (void*)event_after, this); m_parent->DoAddChild( this ); - if (m_windowStyle & wxNB_RIGHT) + if (m_windowStyle & wxBK_RIGHT) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); - if (m_windowStyle & wxNB_LEFT) + if (m_windowStyle & wxBK_LEFT) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); - if (m_windowStyle & wxNB_BOTTOM) + if (m_windowStyle & wxBK_BOTTOM) gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); - gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", - GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); - PostCreation(size); - gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); - - return TRUE; + return true; } int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - - if ( m_selection == -1 ) - { - GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") ); - if (g_list_length(nb_pages) != 0) - { - GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - - gpointer cur = notebook->cur_page; - if ( cur != NULL ) - { - wxConstCast(this, wxNotebook)->m_selection = - g_list_index( nb_pages, cur ); - } - } - } - - return m_selection; + return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) ); } wxString wxNotebook::GetPageText( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); + wxCHECK_MSG(page < GetPageCount(), wxEmptyString, "invalid notebook index"); - wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_text; - else - return wxT(""); + GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label); + return wxGTK_CONV_BACK(gtk_label_get_text(label)); } int wxNotebook::GetPageImage( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index"); - wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_image; - else - return -1; + return GetNotebookPage(page)->m_imageIndex; } wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - - wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - return m_pagesData.Item(page)->GetData(); } -int wxNotebook::SetSelection( size_t page ) +int wxNotebook::DoSetSelection( size_t page, int flags ) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - - wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); + wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index"); int selOld = GetSelection(); - // cache the selection + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this); + } + + gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); + + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this); + } + m_selection = page; - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); wxNotebookPage *client = GetPage(page); if ( client ) @@ -414,109 +254,85 @@ int wxNotebook::SetSelection( size_t page ) return selOld; } -bool wxNotebook::SetPageText( size_t page, const wxString &text ) +void wxNotebook::GTKOnPageChanged() { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - - wxGtkNotebookPage* nb_page = GetNotebookPage(page); + m_selection = gtk_notebook_get_current_page(GTK_NOTEBOOK(m_widget)); - wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); + SendPageChangedEvent(m_oldSelection); +} - nb_page->m_text = text; +bool wxNotebook::SetPageText( size_t page, const wxString &text ) +{ + wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index"); - gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); + GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label); + gtk_label_set_text(label, wxGTK_CONV(text)); - return TRUE; + return true; } bool wxNotebook::SetPageImage( size_t page, int image ) { - /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ - - wxGtkNotebookPage* nb_page = GetNotebookPage(page); - - if (!nb_page) return FALSE; - - /* Optimization posibility: return immediately if image unchanged. - * Not enabled because it may break existing (stupid) code that - * manipulates the imagelist to cycle images */ - - /* if (image == nb_page->m_image) return TRUE; */ - - /* For different cases: - 1) no image -> no image - 2) image -> no image - 3) no image -> image - 4) image -> image */ - - if (image == -1 && nb_page->m_image == -1) - return TRUE; /* Case 1): Nothing to do. */ - - GtkWidget *pixmapwid = (GtkWidget*) NULL; + wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index"); - if (nb_page->m_image != -1) + wxGtkNotebookPage* pageData = GetNotebookPage(page); + if (image >= 0) { - /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */ - - GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box)); - while (child) + wxCHECK_MSG(HasImageList(), false, "invalid notebook imagelist"); + const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(image); + if (bitmap == NULL) + return false; + if (pageData->m_image) { - if (GTK_IS_PIXMAP(child->data)) - { - pixmapwid = GTK_WIDGET(child->data); - break; - } - child = child->next; + gtk_image_set_from_pixbuf( + GTK_IMAGE(pageData->m_image), bitmap->GetPixbuf()); } - - /* We should have the pixmap widget now */ - wxASSERT(pixmapwid != NULL); - - if (image == -1) + else { - /* If there's no new widget, just remove the old from the box */ - gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid); - nb_page->m_image = -1; - - return TRUE; /* Case 2) */ + 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); } } - - /* Only cases 3) and 4) left */ - wxASSERT( m_imageList != NULL ); /* Just in case */ - - /* Construct the new pixmap */ - const wxBitmap *bmp = m_imageList->GetBitmap(image); - GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + else if (pageData->m_image) { - mask = bmp->GetMask()->GetBitmap(); + gtk_widget_destroy(pageData->m_image); + pageData->m_image = NULL; } + pageData->m_imageIndex = image; - if (pixmapwid == NULL) - { - /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */ - pixmapwid = gtk_pixmap_new (pixmap, mask ); + return true; +} - /* CHECKME: Are these pack flags okay? */ - gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); - gtk_widget_show(pixmapwid); - } - else +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const +{ + // Compute the max size of the tab labels. + wxSize sizeTabMax; + const size_t pageCount = GetPageCount(); + for ( size_t n = 0; n < pageCount; n++ ) { - /* Case 4) Simply replace the pixmap */ - gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); + GtkRequisition req; + gtk_widget_get_preferred_size(GetNotebookPage(n)->m_box, NULL, &req); + sizeTabMax.IncTo(wxSize(req.width, req.height)); } - nb_page->m_image = image; + // Unfortunately this doesn't account for the real tab size and I don't + // know how to find it, e.g. where do the margins below come from. + const int PAGE_MARGIN = 3; + const int TAB_MARGIN = 4; - return TRUE; -} + sizeTabMax.IncBy(3*TAB_MARGIN); -void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) -{ - wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); + wxSize sizeFull(sizePage); + if ( IsVertical() ) + sizeFull.y += sizeTabMax.y; + else + sizeFull.x += sizeTabMax.x; + + sizeFull.IncBy(2*PAGE_MARGIN); + + return sizeFull; } void wxNotebook::SetPadding( const wxSize &padding ) @@ -525,24 +341,16 @@ void wxNotebook::SetPadding( const wxSize &padding ) m_padding = padding.GetWidth(); - int i; - for (i=0; im_image != -1) + wxGtkNotebookPage* pageData = GetNotebookPage(i); + if (pageData->m_image) { - // 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); + gtk_box_set_child_packing(GTK_BOX(pageData->m_box), + pageData->m_image, false, false, m_padding, GTK_PACK_START); } - 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); + gtk_box_set_child_packing(GTK_BOX(pageData->m_box), + pageData->m_label, false, false, m_padding, GTK_PACK_END); } } @@ -553,49 +361,30 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) bool wxNotebook::DeleteAllPages() { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - - while (m_pagesData.GetCount() > 0) - DeletePage( m_pagesData.GetCount()-1 ); - - wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + for (size_t i = GetPageCount(); i--;) + DeletePage(i); - InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( size_t page ) -{ - if ( m_selection != -1 && (size_t)m_selection >= page ) - { - // 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( size_t page ) { - wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); + // 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 ); - 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 ); - + // 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 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + // 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); @@ -610,100 +399,81 @@ bool wxNotebook::InsertPage( size_t position, bool select, int imageId ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); - wxCHECK_MSG( win->GetParent() == this, FALSE, + 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 InsertChildInNotebook - // callback why this has to be done. - win->m_widget->parent = NULL; + wxCHECK_MSG( position <= GetPageCount(), false, + wxT("invalid page index in wxNotebookPage::InsertPage()") ); - // 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 ); + // Hack Alert! (Part II): See above in wxNotebook::AddChildGTK + // why this has to be done. + gtk_widget_unparent(win->m_widget); if (m_themeEnabled) - win->SetThemeEnabled(TRUE); + win->SetThemeEnabled(true); GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); - - if ( position == GetPageCount() ) - m_pagesData.Append( nb_page ); - else - m_pagesData.Insert( m_pagesData.Item( position ), nb_page ); + wxGtkNotebookPage* pageData = new wxGtkNotebookPage; m_pages.Insert(win, position); + m_pagesData.Insert(position, pageData); - 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 ); - -#ifndef __VMS - // On VMS position is unsigned and thus always positive - if (position < 0) - gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box ); - else -#endif - gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); + // 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; - nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; - - /* set the label image */ - nb_page->m_image = imageId; + pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); + gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2); + pageData->m_image = NULL; if (imageId != -1) { - wxASSERT( m_imageList != NULL ); - - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); - GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + if (HasImageList()) { - mask = bmp->GetMask()->GetBitmap(); + const wxBitmap* bitmap = GetImageList()->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"); } - - GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - - gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); - - gtk_widget_show(pixmapwid); } /* 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); - nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); + gtk_widget_show_all(pageData->m_box); + gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position); - 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 ); - - /* show the label */ - gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); - if (select && (m_pagesData.GetCount() > 1)) + /* apply current style */ +#ifdef __WXGTK3__ + GTKApplyStyle(pageData->m_label, NULL); +#else + GtkRcStyle *style = GTKCreateWidgetStyle(); + if ( style ) { -#ifndef __VMS - // On VMS position is unsigned and thus always positive - if (position < 0) - SetSelection( GetPageCount()-1 ); - else -#endif - SetSelection( position ); + gtk_widget_modify_style(pageData->m_label, style); + g_object_unref(style); } +#endif - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + if (select && GetPageCount() > 1) + { + SetSelection( position ); + } InvalidateBestSize(); - return TRUE; + return true; } // helper for HitTest(): check if the point lies inside the given widget which @@ -713,61 +483,54 @@ static bool IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, gint x, gint y, gint border = 0) { + GtkAllocation a; + gtk_widget_get_allocation(w, &a); 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); + (pt.x >= a.x - x - border) && + (pt.x <= a.x - x + border + a.width) && + (pt.y >= a.y - y - border) && + (pt.y <= a.y - y + border + a.height); } int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { - const gint x = m_widget->allocation.x; - const gint y = m_widget->allocation.y; + GtkAllocation a; + gtk_widget_get_allocation(m_widget, &a); + const int x = a.x; + const int y = a.y; const size_t count = GetPageCount(); - for ( size_t i = 0; i < count; i++ ) + size_t i = 0; + +#ifndef __WXGTK3__ + GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); + if (gtk_notebook_get_scrollable(notebook)) + i = g_list_position( notebook->children, notebook->first_tab ); +#endif + + for ( ; i < count; i++ ) { - wxGtkNotebookPage* nb_page = GetNotebookPage(i); - GtkWidget *box = nb_page->m_box; + wxGtkNotebookPage* pageData = GetNotebookPage(i); + GtkWidget* box = pageData->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 (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y)) { - if ( GTK_IS_PIXMAP(child->data) ) - { - pixmap = GTK_WIDGET(child->data); - break; - } + *flags = wxBK_HITTEST_ONICON; } - - 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) ) + else if (IsPointInsideWidget(pt, pageData->m_label, x, y)) { - *flags = wxNB_HITTEST_ONLABEL; + *flags = wxBK_HITTEST_ONLABEL; } else { - *flags = wxNB_HITTEST_ONITEM; + *flags = wxBK_HITTEST_ONITEM; } } @@ -776,7 +539,22 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const } if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + { + *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; } @@ -795,52 +573,40 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) { // don't set the sizes of the pages - their correct size is not yet known - wxControl::SetConstraintSizes(FALSE); + wxControl::SetConstraintSizes(false); } bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) { - return TRUE; + return true; } #endif void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) { - // TODO, font for labels etc - gtk_widget_modify_style( m_widget, style ); -} - -bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) -{ - return ((m_widget->window == window) || - (NOTEBOOK_PANEL(m_widget) == window)); + GTKApplyStyle(m_widget, style); + for (size_t i = GetPageCount(); i--;) + GTKApplyStyle(GetNotebookPage(i)->m_label, style); } -bool wxNotebook::SetFont(const wxFont& font) +GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - bool rc=wxNotebookBase::SetFont(font); + windows.push_back(gtk_widget_get_window(m_widget)); +#ifdef __WXGTK3__ + // no access to internal GdkWindows +#else + windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); +#endif - if (rc) - { - size_t i; - for (i=0 ; i < m_pagesData.GetCount() ; i++) - GetNotebookPage(i)->SetFont(font); - } - return rc; + return NULL; } // static wxVisualAttributes wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new()); } -//----------------------------------------------------------------------------- -// wxNotebookEvent -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) - #endif