X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510d156fc53b19ac7a96ada15475575ded389b50..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/gtk/notebook.cpp?ds=sidebyside

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index f1a03228af..f418384a36 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,169 +7,134 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
-
-#include "wx/notebook.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_NOTEBOOK
 
-#include "wx/panel.h"
-#include "wx/utils.h"
-#include "wx/imaglist.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-#include "gdk/gdkkeysyms.h"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/notebook.h"
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"
+    #include "wx/bitmap.h"
+#endif
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#include "wx/imaglist.h"
+#include "wx/fontutil.h"
 
-extern bool   g_blockEventsOnDrag;
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// debug
+// wxGtkNotebookPage
 //-----------------------------------------------------------------------------
 
-#ifdef __WXDEBUG__
-
-extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
-
-#endif
-
-//-----------------------------------------------------------------------------
-// wxNotebookPage
-//-----------------------------------------------------------------------------
+// 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 wxNotebookPage: public wxObject
+class wxGtkNotebookPage: public wxObject
 {
 public:
-  wxNotebookPage()
-  {
-    m_text = "";
-    m_image = -1;
-    m_page = (GtkNotebookPage *) NULL;
-    m_client = (wxWindow *) NULL;
-    m_box = (GtkWidget *) NULL;
-  }
-
-  wxString           m_text;
-  int                m_image;
-  GtkNotebookPage   *m_page;
-  GtkLabel          *m_label;
-  wxWindow          *m_client;
-  GtkWidget         *m_box;     // in which the label and image are packed
+    GtkWidget* m_box;
+    GtkWidget* m_label;
+    GtkWidget* m_image;
+    int m_imageIndex;
 };
 
-//-----------------------------------------------------------------------------
-// "switch_page"
-//-----------------------------------------------------------------------------
-
-static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
-                                              GtkNotebookPage *WXUNUSED(page),
-                                              gint page,
-                                              wxNotebook *notebook )
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
 
-    int old = notebook->GetSelection();
-
-    wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
-                            notebook->GetId(), page, old );
-    event1.SetEventObject( notebook );
-    
-    if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
-        !event1.IsAllowed() )
-    {
-        /* program doesn't allow the page change */
-        gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), "switch_page" );
-        return;
-    }
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGtkNotebookPagesList)
 
-    wxNotebookEvent event2( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                            notebook->GetId(), page, old );
-    event2.SetEventObject( notebook );
-    notebook->GetEventHandler()->ProcessEvent( event2 );
+extern "C" {
+static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*);
 }
 
 //-----------------------------------------------------------------------------
-// "size_allocate"
+// "switch_page"
 //-----------------------------------------------------------------------------
 
-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+extern "C" {
+static void
+switch_page_after(GtkNotebook* widget, GtkNotebookPage*, guint, wxNotebook* win)
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);
 
-    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 );
+    win->GTKOnPageChanged();
+}
+}
+
+extern "C" {
+static void
+switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win)
+{
+    win->m_oldSelection = gtk_notebook_get_current_page(widget);
 
-    if (win->GetAutoLayout())
-        win->Layout();
+    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);
+}
 }
 
 //-----------------------------------------------------------------------------
-// "realize" from m_widget
+// "event_after" from m_widget
 //-----------------------------------------------------------------------------
 
-/* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize 
-   here in order to take repositioning before showing to take effect. */
-
-static gint
-gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *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);
 
-    gtk_widget_queue_resize( win->m_widget );
+    // restore previous selection
+    gtk_notebook_set_current_page(widget, win->m_oldSelection);
 
-    return FALSE;
+    g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win);
+}
 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+void wxNotebook::AddChildGTK(wxWindowGTK* 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, 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_imageList = (wxImageList *) NULL;
-    m_pages.DeleteContents( TRUE );
-    m_lastSelection = -1;
+    m_padding = 0;
+    m_oldSelection = -1;
+    m_themeEnabled = true;
 }
 
 wxNotebook::wxNotebook()
@@ -187,259 +152,156 @@ 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();
 }
 
 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_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();
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name );
-#endif
+    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 );
-
-    m_parent->DoAddChild( this );
-
-	if(m_windowStyle & wxNB_RIGHT)
-		gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
-	if(m_windowStyle & wxNB_LEFT)
-		gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
-	if(m_windowStyle & wxNB_BOTTOM)
-		gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
-
-    PostCreation();
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK(switch_page), this);
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
-                            GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
-			    
-    Show( TRUE );
-
-    return TRUE;
-}
+    g_signal_connect_after (m_widget, "switch_page",
+                      G_CALLBACK(switch_page_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)switch_page_after, this);
 
-void wxNotebook::SetFocus()
-{
-    if (m_pages.GetCount() == 0) return;
+    g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)event_after, this);
 
-    wxNode *node = m_pages.Nth( GetSelection() );
+    m_parent->DoAddChild( this );
 
-    if (!node) return;
+    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 );
 
-    wxNotebookPage *page = (wxNotebookPage*) node->Data();
+    PostCreation(size);
 
-    page->m_client->SetFocus();
+    return true;
 }
 
 int wxNotebook::GetSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
-
-    GList *pages = GTK_NOTEBOOK(m_widget)->children;
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
 
-    if (g_list_length(pages) == 0) return -1;
-
-    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-    
-    if (notebook->cur_page == NULL) return m_lastSelection;
-    
-    return g_list_index( pages, (gpointer)(notebook->cur_page) );
+    return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
 }
 
-int wxNotebook::GetPageCount() const
+wxString wxNotebook::GetPageText( size_t page ) const
 {
-    return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
-}
+    wxCHECK_MSG(page < GetPageCount(), wxEmptyString, "invalid notebook index");
 
-int wxNotebook::GetRowCount() const
-{
-    return 1;
+    GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+    return wxGTK_CONV_BACK(gtk_label_get_text(label));
 }
 
-wxString wxNotebook::GetPageText( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (nb_page)
-        return nb_page->m_text;
-    else
-        return wxT("");
+    return GetNotebookPage(page)->m_imageIndex;
 }
 
-int wxNotebook::GetPageImage( int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (nb_page)
-        return nb_page->m_image;
-    else
-        return -1;
+    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, wxT("invalid notebook") );
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
 
-    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
-    
-    wxNode *node = m_pages.Nth( page );
-    
-    return (wxNotebookPage *) node->Data();
-}
-
-int wxNotebook::SetSelection( int page )
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+    int selOld = GetSelection();
 
-    wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") );
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this);
+    }
 
-    int selOld = GetSelection();
-    
-    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
+    gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
 
-    return selOld;
-}
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
+    }
 
-void wxNotebook::AdvanceSelection( bool forward )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
+    m_selection = page;
 
-    int sel = GetSelection();
-    int max = GetPageCount();
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();
 
-    if (forward)
-        SetSelection( sel == max ? 0 : sel + 1 );
-    else
-        SetSelection( sel == 0 ? max-1 : sel - 1 );
+    return selOld;
 }
 
-void wxNotebook::SetImageList( wxImageList* imageList )
+void wxNotebook::GTKOnPageChanged()
 {
-    m_imageList = imageList;
+    m_selection = gtk_notebook_get_current_page(GTK_NOTEBOOK(m_widget));
+
+    SendPageChangedEvent(m_oldSelection);
 }
 
-bool wxNotebook::SetPageText( int page, const wxString &text )
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-
-    wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
+    wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");
 
-    nb_page->m_text = text;
+    GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+    gtk_label_set_text(label, wxGTK_CONV(text));
 
-    gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );
-   
-    return TRUE;
+    return true;
 }
 
-bool wxNotebook::SetPageImage( int page, int image )
+bool wxNotebook::SetPageImage( size_t page, int image )
 {
-    /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-
-    if (!nb_page) return FALSE;
+    wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");
 
-    /* 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;
-
-    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)
-	{
-            if (GTK_IS_PIXMAP(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) */
+        wxCHECK_MSG(m_imageList, false, "invalid notebook imagelist");
+        const wxBitmap* bitmap = m_imageList->GetBitmapPtr(image);
+        if (bitmap == NULL)
+            return false;
+        if (pageData->m_image)
+        {
+            gtk_image_set_from_pixbuf(
+                GTK_IMAGE(pageData->m_image), bitmap->GetPixbuf());
+        }
+        else
+        {
+            pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+            gtk_widget_show(pageData->m_image);
+            gtk_box_pack_start(GTK_BOX(pageData->m_box),
+                pageData->m_image, false, false, m_padding);
         }
     }
-
-    /* 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() )
-    {
-        mask = bmp->GetMask()->GetBitmap();
-    }
-
-    if (pixmapwid == NULL)
-    {
-        /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
-        pixmapwid = gtk_pixmap_new (pixmap, mask );
-
-        /* CHECKME: Are these pack flags okay? */
-        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
-        gtk_widget_show(pixmapwid);
-    }
-    else
+    else if (pageData->m_image)
     {
-        /* Case 4) Simply replace the pixmap */
-        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+        gtk_widget_destroy(pageData->m_image);
+        pageData->m_image = NULL;
     }
+    pageData->m_imageIndex = image;
 
-    nb_page->m_image = image;
-
-    return TRUE;
+    return true;
 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
@@ -447,9 +309,23 @@ void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
     wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
 }
 
-void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
+void wxNotebook::SetPadding( const wxSize &padding )
 {
-    wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
+
+    m_padding = padding.GetWidth();
+
+    for (size_t i = GetPageCount(); i--;)
+    {
+        wxGtkNotebookPage* pageData = GetNotebookPage(i);
+        if (pageData->m_image)
+        {
+            gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+                pageData->m_image, false, false, m_padding, GTK_PACK_START);
+        }
+        gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+            pageData->m_label, false, false, m_padding, GTK_PACK_END);
+    }
 }
 
 void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
@@ -459,130 +335,200 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 
 bool wxNotebook::DeleteAllPages()
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
+    for (size_t i = GetPageCount(); i--;)
+        DeletePage(i);
 
-    while (m_pages.GetCount() > 0)
-        DeletePage( m_pages.GetCount()-1 );
-
-    return TRUE;
+    return wxNotebookBase::DeleteAllPages();
 }
 
-bool wxNotebook::DeletePage( int page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page) return FALSE;
-
-    /* GTK sets GtkNotebook.cur_page to NULL before sending
-       the switvh page event */
-    m_lastSelection = GetSelection();
-    
-    nb_page->m_client->Destroy();
-    m_pages.DeleteObject( nb_page );
-    
-    m_lastSelection = -1;
+    // 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;
 
-    return TRUE;
-}
-
-bool wxNotebook::RemovePage( int page )
-{
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    
-    if (!nb_page) return FALSE;
+    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 );
 
-    m_pages.DeleteObject( nb_page );
+    // It's safe to remove the page now.
+    wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete"));
+    wxNotebookBase::DoRemovePage(page);
 
-    return TRUE;
+    wxGtkNotebookPage* p = GetNotebookPage(page);
+    m_pagesData.DeleteObject(p);
+    delete p;
+
+    return client;
 }
 
-bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
-                             bool select, int imageId )
+bool wxNotebook::InsertPage( size_t position,
+                             wxNotebookPage* win,
+                             const wxString& text,
+                             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!") );
 
-    /* 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 );
-      
-    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+    wxCHECK_MSG( position <= GetPageCount(), false,
+                 wxT("invalid page index in wxNotebookPage::InsertPage()") );
 
-    wxNotebookPage *page = new wxNotebookPage();
-    
-    if (position < 0)
-        m_pages.Append( page );
-    else
-        m_pages.Insert( m_pages.Nth( position ), page );
-    
-    page->m_client = win;
+    // 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);
 
-    page->m_box = gtk_hbox_new( FALSE, 0 );
-    gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-    gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
-      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+    wxGtkNotebookPage* pageData = new wxGtkNotebookPage;
 
-    if (position < 0)
-        gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
-    else 
-        gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position );
+    m_pages.Insert(win, position);
+    m_pagesData.Insert(position, pageData);
 
-    page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
+    // 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;
 
-    /* set the label image */
-    page->m_image = imageId;
-    
+    pageData->m_box = gtk_hbox_new(false, 1);
+    gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2);
+
+    pageData->m_image = NULL;
     if (imageId != -1)
     {
-        wxASSERT( m_imageList != NULL );
-
-        const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
-        GdkPixmap *pixmap = bmp->GetPixmap();
-        GdkBitmap *mask = (GdkBitmap*) NULL;
-        if ( bmp->GetMask() )
+        if (m_imageList)
         {
-            mask = bmp->GetMask()->GetBitmap();
+            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");
         }
-
-        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
-
-        gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
-
-        gtk_widget_show(pixmapwid);
     }
 
     /* set the label text */
-    page->m_text = text;
-    if (page->m_text.IsEmpty()) page->m_text = wxT("");
-    
-    page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) );
-    gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 );
+    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);
 
-    /* show the label */
-    gtk_widget_show( GTK_WIDGET(page->m_label) );
+    gtk_widget_show_all(pageData->m_box);
+    gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position);
 
-    if (select && (m_pages.GetCount() > 1))
+    /* apply current style */
+    GtkRcStyle *style = GTKCreateWidgetStyle();
+    if ( style )
     {
-        if (position < 0)
-            SetSelection( GetPageCount()-1 );
-	else
-            SetSelection( position );
+        gtk_widget_modify_style(pageData->m_label, style);
+        g_object_unref(style);
     }
 
-    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 );
+    }
 
-    return TRUE;
+    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)
+{
+    GtkAllocation a;
+    gtk_widget_get_allocation(w, &a);
+    return
+        (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);
 }
 
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool select, int imageId)
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 {
-    return InsertPage( -1, win, text, select, imageId );
+    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* pageData = GetNotebookPage(i);
+        GtkWidget* box = pageData->m_box;
+
+        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
+
+        if ( IsPointInsideWidget(pt, box, x, y, border) )
+        {
+            // ok, we're inside this tab -- now find out where, if needed
+            if ( flags )
+            {
+                if (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y))
+                {
+                    *flags = wxBK_HITTEST_ONICON;
+                }
+                else if (IsPointInsideWidget(pt, pageData->m_label, x, y))
+                {
+                    *flags = wxBK_HITTEST_ONLABEL;
+                }
+                else
+                {
+                    *flags = wxBK_HITTEST_ONITEM;
+                }
+            }
+
+            return i;
+        }
+    }
+
+    if ( flags )
+    {
+        *flags = wxBK_HITTEST_NOWHERE;
+        wxWindowBase * page = GetCurrentPage();
+        if ( page )
+        {
+            // rect origin is in notebook's parent coordinates
+            wxRect rect = page->GetRect();
+
+            // adjust it to the notebook's coordinates
+            wxPoint pos = GetPosition();
+            rect.x -= pos.x;
+            rect.y -= pos.y;
+            if ( rect.Contains( pt ) )
+                *flags |= wxBK_HITTEST_ONPAGE;
+        }
+    }
+
+    return wxNOT_FOUND;
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
@@ -593,45 +539,42 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         event.Skip();
 }
 
-wxWindow *wxNotebook::GetPage( int page ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page)
-        return (wxWindow *) NULL;
-    else
-        return nb_page->m_client;
-}
+#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);
+    wxControl::SetConstraintSizes(false);
 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
-    return TRUE;
+    return true;
 }
 
-void wxNotebook::ApplyWidgetStyle()
+#endif
+
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    for (size_t i = GetPageCount(); i--;)
+        gtk_widget_modify_style(GetNotebookPage(i)->m_label, style);
 }
 
-bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    return ((m_widget->window == window) ||
-            (GTK_NOTEBOOK(m_widget)->panel == window));
-}
+    windows.push_back(gtk_widget_get_window(m_widget));
+    windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
 
-//-----------------------------------------------------------------------------
-// wxNotebookEvent
-//-----------------------------------------------------------------------------
+    return NULL;
+}
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
+}
 
 #endif