X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789d0a3dd9c297a906f948b9a2bcb75e99ef0000..601398b9b1e63109f44af34ff79bc558fe929b4d:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index eff2994167..ee0dec46a7 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,26 +7,25 @@ // 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 "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" #include @@ -37,13 +36,6 @@ 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 //----------------------------------------------------------------------------- @@ -64,79 +56,68 @@ extern bool g_blockEventsOnDrag; class wxGtkNotebookPage: public wxObject { public: - wxGtkNotebookPage() - { - m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; - } - - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - GtkWidget *m_box; // in which the label and image are packed + wxGtkNotebookPage() + { + m_image = -1; + m_page = (GtkNotebookPage *) NULL; + m_box = (GtkWidget *) NULL; + } + + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + GtkWidget *m_box; // in which the label and image are packed }; + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGtkNotebookPagesList); +WX_DEFINE_LIST(wxGtkNotebookPagesList) + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- -static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *WXUNUSED(page), - gint page, - wxNotebook *notebook ) +extern "C" { +static void gtk_notebook_page_changing_callback( GtkNotebook *widget, + GtkNotebookPage *WXUNUSED(gpage), + guint page, + wxNotebook *notebook ) { - // 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") ); + int old = gtk_notebook_get_current_page( widget ); - 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() ) + if ( !notebook->SendPageChangingEvent(page) ) { - /* program doesn't allow the page change */ - gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), - "switch_page" ); + // program doesn't allow the page change + g_signal_stop_emission_by_name(notebook->m_widget, "switch_page"); } - else // change allowed + else { - // 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 ); + // the page change event also reports the old page + notebook->m_oldSelection = old; } +} +} - notebook->m_inSwitchPage = FALSE; +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" //----------------------------------------------------------------------------- +extern "C" { 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) && @@ -146,105 +127,61 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* } 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 +extern "C" { +static void gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *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 ); - - return FALSE; } - -//----------------------------------------------------------------------------- -// "key_press_event" -//----------------------------------------------------------------------------- - -static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; - - /* 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; } //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) +static void wxInsertChildInNotebook(wxWindow* parent, wxWindow* child) { - /* we don't do anything here but pray */ + // Hack Alert! (Part I): This sets the notebook as the parent of the child + // widget, and takes care of some details such as updating the state and + // style of the child to reflect its new location. We do this early + // because without it GetBestSize (which is used to set the initial size + // of controls if an explicit size is not given) will often report + // incorrect sizes since the widget's style context is not fully known. + // See bug #901694 for details + // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863) + gtk_widget_set_parent(child->m_widget, parent->m_widget); + + // NOTE: This should be considered a temporary workaround until we can + // work out the details and implement delaying the setting of the initial + // size of widgets until the size is really needed. } //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase) -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() @@ -262,10 +199,6 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { - /* don't generate change page events any more */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); - DeleteAllPages(); } @@ -273,15 +206,16 @@ 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; + m_insertCallback = 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; } @@ -289,66 +223,45 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, 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 (gtk_notebook_page_changing_callback), this); + + g_signal_connect_after (m_widget, "switch_page", + G_CALLBACK (gtk_notebook_page_changed_callback), 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(); - - SetFont( parent->GetFont() ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); + PostCreation(size); - Show( TRUE ); + g_signal_connect (m_widget, "realize", + G_CALLBACK (gtk_notebook_realized_callback), 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; - - 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( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return wxT(""); + return wxEmptyString; } int wxNotebook::GetPageImage( size_t page ) const @@ -371,7 +284,7 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const 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") ); @@ -379,9 +292,25 @@ int wxNotebook::SetSelection( size_t page ) int selOld = GetSelection(); - // cache the selection - m_selection = page; - gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); + 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 ); + + 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); + } wxNotebookPage *client = GetPage(page); if ( client ) @@ -392,17 +321,17 @@ int wxNotebook::SetSelection( size_t page ) bool wxNotebook::SetPageText( size_t page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); - wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); + wxCHECK_MSG( nb_page, false, wxT("SetPageText: invalid page index") ); nb_page->m_text = text; - gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); + gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); - return TRUE; + return true; } bool wxNotebook::SetPageImage( size_t page, int image ) @@ -411,13 +340,13 @@ bool wxNotebook::SetPageImage( size_t page, int image ) wxGtkNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + 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; */ + /* if (image == nb_page->m_image) return true; */ /* For different cases: 1) no image -> no image @@ -426,7 +355,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) 4) image -> image */ if (image == -1 && nb_page->m_image == -1) - return TRUE; /* Case 1): Nothing to do. */ + return true; /* Case 1): Nothing to do. */ GtkWidget *pixmapwid = (GtkWidget*) NULL; @@ -434,10 +363,10 @@ bool wxNotebook::SetPageImage( size_t page, int image ) { /* 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)); + GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box)); while (child) { - if (GTK_IS_PIXMAP(child->data)) + if (GTK_IS_IMAGE(child->data)) { pixmapwid = GTK_WIDGET(child->data); break; @@ -454,7 +383,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid); nb_page->m_image = -1; - return TRUE; /* Case 2) */ + return true; /* Case 2) */ } } @@ -462,18 +391,12 @@ bool wxNotebook::SetPageImage( size_t page, int image ) 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() ) - { - mask = bmp->GetMask()->GetBitmap(); - } + 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_pixmap_new (pixmap, mask ); + 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); @@ -482,12 +405,12 @@ bool wxNotebook::SetPageImage( size_t page, int image ) else { /* Case 4) Simply replace the pixmap */ - gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); + gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf()); } nb_page->m_image = image; - return TRUE; + return true; } void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) @@ -529,50 +452,43 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) bool wxNotebook::DeleteAllPages() { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); + 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") ); + InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( size_t page ) -{ - // GTK sets GtkNotebook.cur_page to NULL before sending the switch page - // event so we have to store the selection internally - if ( m_selection == -1 ) - { - m_selection = GetSelection(); - if ( m_selection == (int)m_pagesData.GetCount() - 1 ) - { - // the index will become invalid after the page is deleted - m_selection = -1; - } - } - - // it will call our DoRemovePage() to do the real work - return wxNotebookBase::DeletePage(page); -} - wxNotebookPage *wxNotebook::DoRemovePage( 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 ); + // 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; } @@ -582,20 +498,23 @@ 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, + wxCHECK_MSG( position <= GetPageCount(), false, _T("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 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); + win->SetThemeEnabled(true); GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -604,20 +523,17 @@ bool wxNotebook::InsertPage( size_t position, if ( position == GetPageCount() ) m_pagesData.Append( nb_page ); else - m_pagesData.Insert( m_pagesData.Item( position ), nb_page ); + m_pagesData.Insert( position, nb_page ); m_pages.Insert(win, position); nb_page->m_box = gtk_hbox_new( FALSE, 1 ); - gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); + gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2); - gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); + g_signal_connect (win->m_widget, "size_allocate", + G_CALLBACK (gtk_page_size_callback), win); - if (position < 0) - gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box ); - else - gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; @@ -628,42 +544,130 @@ bool wxNotebook::InsertPage( size_t position, { wxASSERT( m_imageList != NULL ); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); - GdkPixmap *pixmap = bmp->GetPixmap(); - GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) - { - mask = bmp->GetMask()->GetBitmap(); - } - - GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - + 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); } /* set the label text */ - nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); - - nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) ); + + nb_page->m_text = wxStripMenuCodes(text); + if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString; + + nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); - + + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); + gtk_rc_style_unref(style); + } + /* show the label */ gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); + if (select && (m_pagesData.GetCount() > 1)) { - if (position < 0) - SetSelection( GetPageCount()-1 ); - else - SetSelection( position ); + SetSelection( position ); + } + + InvalidateBestSize(); + return true; +} + +// helper for HitTest(): check if the point lies inside the given widget which +// is the child of the notebook whose position and border size are passed as +// parameters +static bool +IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, + gint x, gint y, gint border = 0) +{ + return + (pt.x >= w->allocation.x - x - border) && + (pt.x <= w->allocation.x - x + border + w->allocation.width) && + (pt.y >= w->allocation.y - y - border) && + (pt.y <= w->allocation.y - y + border + w->allocation.height); +} + +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const +{ + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; + + const size_t count = GetPageCount(); + 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* 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(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + 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 TRUE; + return wxNOT_FOUND; } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) @@ -680,28 +684,37 @@ 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::ApplyWidgetStyle() +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); +} + +GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - // TODO, font for labels etc + windows.push_back(m_widget->window); + windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return NULL; } -bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) +// static +wxVisualAttributes +wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return ((m_widget->window == window) || - (NOTEBOOK_PANEL(m_widget) == window)); + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); } //-----------------------------------------------------------------------------