X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75c6febf442f1a70eef68731fa96f666b500c6cb..ad7922b8aaf4aea61c4a364887fc89b0548a6047:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 7efa874a10..f418384a36 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -41,16 +41,10 @@ class wxGtkNotebookPage: public wxObject { public: - wxGtkNotebookPage() - { - m_image = -1; - m_box = NULL; - } - - wxString m_text; - int m_image; - 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; }; @@ -67,10 +61,11 @@ static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*); extern "C" { static void -switch_page_after(GtkWidget* widget, GtkNotebookPage*, guint, wxNotebook* win) +switch_page_after(GtkNotebook* widget, GtkNotebookPage*, guint, wxNotebook* win) { g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win); - win->SendPageChangedEvent(win->m_oldSelection); + + win->GTKOnPageChanged(); } } @@ -110,7 +105,7 @@ static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win) // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) +void wxNotebook::AddChildGTK(wxWindowGTK* 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 @@ -120,7 +115,7 @@ static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) // 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); + 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 @@ -131,8 +126,6 @@ static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() @@ -140,8 +133,6 @@ END_EVENT_TABLE() void wxNotebook::Init() { m_padding = 0; - - m_imageList = (wxImageList *) NULL; m_oldSelection = -1; m_themeEnabled = true; } @@ -168,8 +159,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - m_insertCallback = wxInsertChildInNotebook; - if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) style |= wxBK_TOP; @@ -182,6 +171,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_notebook_new(); + g_object_ref(m_widget); gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); @@ -211,47 +201,34 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") ); return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) ); } wxString wxNotebook::GetPageText( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, wxEmptyString, 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 wxEmptyString; + 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::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(); @@ -267,6 +244,8 @@ int wxNotebook::DoSetSelection( size_t page, int flags ) g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this); } + m_selection = page; + wxNotebookPage *client = GetPage(page); if ( client ) client->SetFocus(); @@ -274,96 +253,53 @@ int wxNotebook::DoSetSelection( size_t page, int flags ) 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_text( 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; } 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 */ + wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index"); - if (image == -1 && nb_page->m_image == -1) - return true; /* Case 1): Nothing to do. */ - - GtkWidget *pixmapwid = (GtkWidget*) NULL; - - 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_get_children(GTK_CONTAINER(nb_page->m_box)); - while (child) + wxCHECK_MSG(m_imageList, false, "invalid notebook imagelist"); + const wxBitmap* bitmap = m_imageList->GetBitmapPtr(image); + if (bitmap == NULL) + return false; + if (pageData->m_image) { - if (GTK_IS_IMAGE(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->GetBitmapPtr(image); - - if (pixmapwid == NULL) - { - /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */ - pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf()); - - /* 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 + else if (pageData->m_image) { - /* Case 4) Simply replace the pixmap */ - gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf()); + gtk_widget_destroy(pageData->m_image); + pageData->m_image = NULL; } - - nb_page->m_image = image; + pageData->m_imageIndex = image; return true; } @@ -379,24 +315,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); } } @@ -407,14 +335,9 @@ 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 ); + for (size_t i = GetPageCount(); i--;) + DeletePage(i); - wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); - - InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } @@ -429,7 +352,6 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t 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 @@ -443,7 +365,7 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) wxGtkNotebookPage* p = GetNotebookPage(page); m_pagesData.DeleteObject(p); delete p; - + return client; } @@ -459,68 +381,65 @@ bool wxNotebook::InsertPage( size_t position, wxT("Can't add a page whose parent is not the notebook!") ); wxCHECK_MSG( position <= GetPageCount(), false, - _T("invalid page index in wxNotebookPage::InsertPage()") ); + wxT("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; + // 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); GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); - - if ( position == GetPageCount() ) - m_pagesData.Append( nb_page ); - else - m_pagesData.Insert( position, nb_page ); + 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. - nb_page->m_image = imageId; - nb_page->m_text = wxStripMenuCodes(text); - - nb_page->m_box = gtk_hbox_new( FALSE, 1 ); - gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); + pageData->m_imageIndex = imageId; - gtk_notebook_insert_page(notebook, win->m_widget, nb_page->m_box, position); + 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) { - wxASSERT( m_imageList != NULL ); - - const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); - GtkWidget* pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf()); - gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); - gtk_widget_show(pixmapwid); + 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 */ - 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 ); + 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(); + GtkRcStyle *style = GTKCreateWidgetStyle(); if ( style ) { - gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); - gtk_rc_style_unref(style); + gtk_widget_modify_style(pageData->m_label, style); + g_object_unref(style); } - /* show the label */ - gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); - - if (select && (m_pagesData.GetCount() > 1)) + if (select && GetPageCount() > 1) { SetSelection( position ); } @@ -536,29 +455,35 @@ 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(); size_t i = 0; +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GSEAL_ENABLE) 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; const gint border = gtk_container_get_border_width(GTK_CONTAINER(box)); @@ -567,26 +492,11 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const // ok, we're inside this tab -- now find out where, if needed if ( flags ) { - GtkWidget *pixmap = NULL; - - GList *children = gtk_container_get_children(GTK_CONTAINER(box)); - for ( GList *child = children; child; child = child->next ) - { - if (GTK_IS_IMAGE(child->data)) - { - pixmap = GTK_WIDGET(child->data); - break; - } - } - - if ( children ) - g_list_free(children); - - if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) + if (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y)) { *flags = wxBK_HITTEST_ONICON; } - else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) + else if (IsPointInsideWidget(pt, pageData->m_label, x, y)) { *flags = wxBK_HITTEST_ONLABEL; } @@ -648,14 +558,13 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) { 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); + for (size_t i = GetPageCount(); i--;) + gtk_widget_modify_style(GetNotebookPage(i)->m_label, style); } GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - windows.push_back(m_widget->window); + windows.push_back(gtk_widget_get_window(m_widget)); windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); return NULL;