X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index ec2257fb24..6658fa5c13 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,464 +7,700 @@ // 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" + +#include + +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) //----------------------------------------------------------------------------- -// wxNotebookPage +// data //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +extern bool g_blockEventsOnDrag; + +//----------------------------------------------------------------------------- +// wxGtkNotebookPage +//----------------------------------------------------------------------------- + +// 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 = (GtkNotebookPage *) NULL; - m_client = (wxWindow *) NULL; - m_parent = (GtkNotebook *) NULL; - m_box = (GtkWidget *) 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; // 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) + + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- -static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *WXUNUSED(page), - gint nPage, - gpointer data) +extern "C" { +static void gtk_notebook_page_changing_callback( GtkNotebook *widget, + GtkNotebookPage *WXUNUSED(gpage), + guint page, + wxNotebook *notebook ) { - wxNotebook *notebook = (wxNotebook *)data; + int old = gtk_notebook_get_current_page( widget ); - int old = notebook->GetSelection(); + if ( !notebook->SendPageChangingEvent(page) ) + { + // program doesn't allow the page change + g_signal_stop_emission_by_name(notebook->m_widget, "switch_page"); + } + else + { + // the page change event also reports the old page + notebook->m_oldSelection = old; + } +} +} - // TODO: emulate PAGE_CHANGING event - - wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - notebook->GetId(), nPage, old ); - event.SetEventObject( notebook ); - notebook->GetEventHandler()->ProcessEvent( event ); +extern "C" { +static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget), + GtkNotebookPage *WXUNUSED(gpage), + guint WXUNUSED(page), + wxNotebook *notebook ) +{ + int old = notebook->m_oldSelection; + notebook->SendPageChangedEvent( old ); +} } //----------------------------------------------------------------------------- -// "size_allocate" +// "realize" from m_widget //----------------------------------------------------------------------------- -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) +extern "C" { +static void +gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { - if (win->GetAutoLayout()) win->Layout(); + /* 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 ); +} +} - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } +//----------------------------------------------------------------------------- +// InsertChild callback for wxNotebook +//----------------------------------------------------------------------------- - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); +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 = (wxImageList *) NULL; - m_pages.DeleteContents( TRUE ); - m_idHandler = 0; + m_padding = 0; + + m_imageList = (wxImageList *) NULL; + 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 (gtk_notebook_page_changing_callback), this); - return TRUE; -} - -int wxNotebook::GetSelection() const -{ - wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" ); - - if (m_pages.Number() == 0) return -1; + g_signal_connect_after (m_widget, "switch_page", + G_CALLBACK (gtk_notebook_page_changed_callback), this); - GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page; + m_parent->DoAddChild( this ); - wxNotebookPage *page = (wxNotebookPage *) 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?" ); + g_signal_connect (m_widget, "realize", + G_CALLBACK (gtk_notebook_realized_callback), this); - 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( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); + + wxGtkNotebookPage* nb_page = GetNotebookPage(page); + if (nb_page) + return nb_page->m_text; + else + return wxEmptyString; } -wxString wxNotebook::GetPageText( int page ) const +int wxNotebook::GetPageImage( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" ); - - wxNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_text; - else - return ""; + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + + wxGtkNotebookPage* nb_page = GetNotebookPage(page); + if (nb_page) + return nb_page->m_image; + else + return -1; } -int wxNotebook::GetPageImage( int page ) const +wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_image; - else - return 0; + wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); + + return m_pagesData.Item(page)->GetData(); } -wxNotebookPage* wxNotebook::GetNotebookPage(int page) const +int wxNotebook::DoSetSelection( size_t page, int flags ) { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); + + wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") ); + + int selOld = GetSelection(); - wxNotebookPage *nb_page = (wxNotebookPage *) NULL; + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); + + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_notebook_page_changed_callback, this); + } + + gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); - wxNode *node = m_pages.First(); - while (node) - { - nb_page = (wxNotebookPage*)node->Data(); - if (nb_page->m_id == page) - return nb_page; - node = node->Next(); - } + if ( !(flags & SetSelection_SendEvent) ) + { + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changing_callback, this); + + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_notebook_page_changed_callback, this); + } - wxLogDebug( "Notebook page %d not found!", page ); + wxNotebookPage *client = GetPage(page); + if ( client ) + client->SetFocus(); - return (wxNotebookPage *) NULL; + return selOld; } -int wxNotebook::SetSelection( int page ) +bool wxNotebook::SetPageText( size_t page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); - int selOld = GetSelection(); - wxNotebookPage* nb_page = GetNotebookPage(page); - - if (!nb_page) return -1; + wxGtkNotebookPage* nb_page = GetNotebookPage(page); - 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; - } + wxCHECK_MSG( nb_page, false, wxT("SetPageText: invalid page index") ); - if (!child) return -1; + nb_page->m_text = text; - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); + gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); - return selOld; + return true; } -void wxNotebook::AdvanceSelection( bool bForward ) +bool wxNotebook::SetPageImage( size_t page, int image ) { - wxCHECK_RET( m_widget != NULL, "invalid notebook" ); + /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ - int sel = GetSelection(); - int max = GetPageCount(); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (bForward) - SetSelection( sel == max ? 0 : sel + 1 ); - else - SetSelection( sel == 0 ? max : sel - 1 ); -} + if (!nb_page) return false; -void wxNotebook::SetImageList( wxImageList* imageList ) -{ - m_imageList = imageList; -} + /* Optimization posibility: return immediately if image unchanged. + * Not enabled because it may break existing (stupid) code that + * manipulates the imagelist to cycle images */ -bool wxNotebook::SetPageText( int page, const wxString &text ) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" ); + /* if (image == nb_page->m_image) return true; */ - wxNotebookPage* nb_page = GetNotebookPage(page); - - if (!nb_page) return FALSE; + /* For different cases: + 1) no image -> no image + 2) image -> no image + 3) no image -> image + 4) image -> image */ - nb_page->m_text = text; + if (image == -1 && nb_page->m_image == -1) + return true; /* Case 1): Nothing to do. */ - return TRUE; -} + GtkWidget *pixmapwid = (GtkWidget*) NULL; -bool wxNotebook::SetPageImage( int page, int image ) -{ - wxNotebookPage* nb_page = GetNotebookPage(page); - - if (!nb_page) return FALSE; + if (nb_page->m_image != -1) + { + /* 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) + { + if (GTK_IS_IMAGE(child->data)) + { + pixmapwid = GTK_WIDGET(child->data); + break; + } + child = child->next; + } + + /* We should have the pixmap widget now */ + wxASSERT(pixmapwid != NULL); + + if (image == -1) + { + /* 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) */ + } + } - nb_page->m_image = image; + /* 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 + { + /* Case 4) Simply replace the pixmap */ + gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf()); + } - return TRUE; + nb_page->m_image = image; + + return true; } void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" ); + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); +} + +void wxNotebook::SetPadding( const wxSize &padding ) +{ + 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::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() { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); - wxNode *page_node = m_pages.First(); - while (page_node) - { - wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); + while (m_pagesData.GetCount() > 0) + DeletePage( m_pagesData.GetCount()-1 ); - DeletePage( page->m_id ); + wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); - page_node = m_pages.First(); - } + InvalidateBestSize(); + return wxNotebookBase::DeleteAllPages(); +} - return TRUE; +wxNotebookPage *wxNotebook::DoRemovePage( size_t 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 ); + + // 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::DeletePage( int page ) +bool wxNotebook::InsertPage( size_t position, + wxNotebookPage* win, + const wxString& text, + bool select, + int imageId ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); - 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; - } + wxCHECK_MSG( win->GetParent() == this, false, + wxT("Can't add a page whose parent is not the notebook!") ); - wxASSERT( child ); + wxCHECK_MSG( position <= GetPageCount(), false, + _T("invalid page index in wxNotebookPage::InsertPage()") ); - delete nb_page->m_client; + // 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; -// Amazingly, this is not necessary -// gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); + if (m_themeEnabled) + win->SetThemeEnabled(true); - m_pages.DeleteObject( nb_page ); + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - return TRUE; -} + wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, - bool bSelect, int imageId) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" ); + if ( position == GetPageCount() ) + m_pagesData.Append( nb_page ); + else + m_pagesData.Insert( position, nb_page ); - // we've created the notebook page in AddChild(). Now we just have to set - // the caption for the page and set the others parameters. + m_pages.Insert(win, position); - wxNotebookPage *page = (wxNotebookPage *) NULL; + // 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); - wxNode *node = m_pages.First(); - while (node) - { - page = (wxNotebookPage*)node->Data(); - if ( page->m_client == win ) break; - node = node->Next(); - } + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); + gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); - wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" ); + gint idx = gtk_notebook_insert_page(notebook, win->m_widget, + nb_page->m_box, position); - if (imageId != -1) - { - wxASSERT( m_imageList != NULL ); + nb_page->m_page = (GtkNotebookPage *)gtk_notebook_get_nth_page(notebook, idx); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); - GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + if (imageId != -1) { - mask = bmp->GetMask()->GetBitmap(); - } - - GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); + wxASSERT( m_imageList != NULL ); - gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); - - gtk_widget_show(pixmapwid); - } + 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); + } - // then set the attributes - page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = ""; - page->m_image = imageId; - page->m_label = (GtkLabel *)gtk_label_new(page->m_text); - gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3); + /* 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 ); - // @@@: what does this do? do we still need it? - // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); + gtk_rc_style_unref(style); + } - gtk_widget_show((GtkWidget *)page->m_label); + /* show the label */ + gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); - if (bSelect) SetSelection(GetPageCount()); + if (select && (m_pagesData.GetCount() > 1)) + { + SetSelection( position ); + } - return TRUE; + 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) { - wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" ); - - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return (wxWindow *) 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 { - wxCHECK_RET( m_widget != NULL, "invalid notebook" ); + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; - m_children.Append(win); + const size_t count = GetPageCount(); + size_t i = 0; - wxNotebookPage *page = new wxNotebookPage(); + GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); + if (gtk_notebook_get_scrollable(notebook)) + i = g_list_position( notebook->children, notebook->first_tab ); - page->m_id = GetPageCount(); - - page->m_box = gtk_hbox_new (FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(page->m_box), 2); - - page->m_client = win; - gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, page->m_box ); - - page->m_page = - (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); - - page->m_parent = GTK_NOTEBOOK(m_widget); + for ( ; i < count; i++ ) + { + wxGtkNotebookPage* nb_page = GetNotebookPage(i); + GtkWidget *box = nb_page->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 ) + { + 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) ) + { + *flags = wxBK_HITTEST_ONICON; + } + else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) + { + *flags = wxBK_HITTEST_ONLABEL; + } + else + { + *flags = wxBK_HITTEST_ONITEM; + } + } + + return i; + } + } - gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); + 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; + } + } - if (!page->m_page) - { - wxLogFatalError( "Notebook page creation error" ); - return; - } + return wxNOT_FOUND; +} - m_pages.Append( page ); +void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) +{ + if (event.IsWindowChange()) + AdvanceSelection( event.GetDirection() ); + else + event.Skip(); } +#if wxUSE_CONSTRAINTS + // 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); + // don't set the sizes of the pages - their correct size is not yet known + wxControl::SetConstraintSizes(false); } bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) { - return TRUE; + return true; +} + +#endif + +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); } -void wxNotebook::ApplyWidgetStyle() +GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + windows.push_back(m_widget->window); + windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); + + return NULL; +} + +// static +wxVisualAttributes +wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } //----------------------------------------------------------------------------- // wxNotebookEvent //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) +#endif