X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5549fa6559b3e4fdb975df6b4abd253279ed5351..b1633d20d6f06a0b5a77d5208c0beddf19324f33:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 2eb7a24f51..9d70d97f45 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -12,16 +12,26 @@
 #endif
 
 #include "wx/notebook.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/private.h"
 #include "wx/gtk/win_gtk.h"
-#include "gdk/gdkkeysyms.h"
+
+#include <gdk/gdkkeysyms.h>
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -34,7 +44,7 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 // debug
@@ -47,74 +57,83 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 #endif
 
 //-----------------------------------------------------------------------------
-// wxNotebookPage
+// wxGtkNotebookPage
 //-----------------------------------------------------------------------------
 
-class wxNotebookPage: public wxObject
+// 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()
+  wxGtkNotebookPage()
   {
-    m_id = -1;
-    m_text = "";
     m_image = -1;
     m_page = (GtkNotebookPage *) NULL;
-    m_client = (wxWindow *) NULL;
-    m_parent = (GtkNotebook *) NULL;
     m_box = (GtkWidget *) NULL;
-    m_added = FALSE;
-  }
-
-  /*
-     mark page as "added' to the notebook, return FALSE if the page was
-     already added
-   */
-
-  bool Add()
-  {
-    if ( WasAdded() )
-      return FALSE;
-
-    m_added = TRUE;
-    return TRUE;
   }
 
-  bool WasAdded() const { return m_added; }
-
-  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
-
-private:
-  bool m_added;
 };
 
+#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)
+                                              gint page,
+                                              wxNotebook *notebook )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    static bool s_inPageChange = FALSE;
+
+    // are you trying to call SetSelection() from a notebook event handler?
+    // you shouldn't!
+    wxCHECK_RET( !s_inPageChange,
+                 _T("gtk_notebook_page_change_callback reentered") );
 
-    wxNotebook *notebook = (wxNotebook *)data;
+    s_inPageChange = TRUE;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
     int old = notebook->GetSelection();
 
-    // TODO: emulate PAGE_CHANGING event
+    wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+                                   notebook->GetId(), page, old );
+    eventChanging.SetEventObject( notebook );
 
-    wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                           notebook->GetId(),  nPage, old );
-    event.SetEventObject( notebook );
-    notebook->GetEventHandler()->ProcessEvent( event );
+    if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) &&
+         !eventChanging.IsAllowed() )
+    {
+        /* program doesn't allow the page change */
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget),
+                                      "switch_page" );
+    }
+    else // change allowed
+    {
+        // make wxNotebook::GetSelection() return the correct (i.e. consistent
+        // with wxNotebookEvent::GetSelection()) value even though the page is
+        // not really changed in GTK+
+        notebook->m_selection = page;
+
+        wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+                                      notebook->GetId(), page, old );
+        eventChanged.SetEventObject( notebook );
+        notebook->GetEventHandler()->ProcessEvent( eventChanged );
+    }
+
+    s_inPageChange = FALSE;
 }
 
 //-----------------------------------------------------------------------------
@@ -123,8 +142,9 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-    
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&
@@ -132,77 +152,85 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
     {
         return;
     }
-    
+
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
-    if (win->GetAutoLayout()) win->Layout();
+    /* 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 );
+    }
 }
 
 //-----------------------------------------------------------------------------
-// "key_press_event"
+// "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 static gint
-gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook )
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-    if (g_blockEventsOnDrag) return FALSE;
+    /* 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 (!notebook->HasVMT()) return FALSE;
-
-    /* this code makes jumping down from the handles of the notebooks
-       to the actual items in the visible notebook page possible with
-       the down-arrow key */
-
-    if (gdk_event->keyval != GDK_Down) return FALSE;
-
-    if (notebook != notebook->FindFocus()) return FALSE;
-
-    if (notebook->m_pages.GetCount() == 0) return FALSE;
+    return FALSE;
+}
 
-    wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() );
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
 
-    if (!node) return FALSE;
+static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-    wxNotebookPage *page = (wxNotebookPage*) node->Data();
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
 
-    // don't let others the key event
-    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+    /* 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();
+        wxGtkNotebookPage *page = win->GetNotebookPage(sel);
+        wxCHECK_MSG( 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();
+        }
 
-    page->m_client->SetFocus();
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
 
-    return TRUE;
+    return FALSE;
 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
 {
-    wxNotebookPage *page = new wxNotebookPage();
-
-    page->m_id = parent->GetPageCount();
-
-    page->m_box = gtk_hbox_new (FALSE, 0);
-    gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
-
-    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-
-    page->m_client = child;
-    gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
-
-    page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-
-    page->m_parent = notebook;
-
-    gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
-      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-
-    wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );
-
-    parent->m_pages.Append( page );
+    /* we don't do anything here but pray */
 }
 
 //-----------------------------------------------------------------------------
@@ -218,8 +246,9 @@ END_EVENT_TABLE()
 void wxNotebook::Init()
 {
     m_imageList = (wxImageList *) NULL;
-    m_pages.DeleteContents( TRUE );
-    m_idHandler = 0;
+    m_pagesData.DeleteContents( TRUE );
+    m_selection = -1;
+    m_themeEnabled = TRUE;
 }
 
 wxNotebook::wxNotebook()
@@ -237,45 +266,59 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 
 wxNotebook::~wxNotebook()
 {
-    // don't generate change page events any more
-    if (m_idHandler != 0)
-      gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
+    /* 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;
 
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+        return FALSE;
+    }
+
 
     m_widget = gtk_notebook_new();
 
 #ifdef __WXDEBUG__
-    debug_focus_in( m_widget, _T("wxNotebook::m_widget"), name );
+    debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name );
 #endif
 
     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 );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-    m_parent->AddChild( this );
+    m_parent->DoAddChild( this );
 
-    (m_parent->m_insertCallback)( m_parent, 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 );
 
     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 );
+
     Show( TRUE );
 
     return TRUE;
@@ -283,155 +326,90 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 int wxNotebook::GetSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    if (m_pages.Number() == 0) return -1;
-
-    GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-    if (!g_page) return -1;
-
-    wxNotebookPage *page = (wxNotebookPage *) NULL;
-
-    wxNode *node = m_pages.First();
-    while (node)
+    if ( m_selection == -1 )
     {
-        page = (wxNotebookPage*)node->Data();
+        GList *pages = GTK_NOTEBOOK(m_widget)->children;
 
-        if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL))
+        if (g_list_length(pages) != 0)
         {
-            // page->m_page is NULL directly after gtk_notebook_append. gtk emits
-            // "switch_page" then and we ask for GetSelection() in the handler for
-            // "switch_page". otherwise m_page should never be NULL. all this
-            // might also be wrong.
-            break;
-        }
-        node = node->Next();
-    }
-
-    wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") );
-
-    return page->m_id;
-}
-
-int wxNotebook::GetPageCount() const
-{
-    // count only the pages which were already added to the notebook for MSW
-    // compatibility (and, in fact, this behaviour makes more sense anyhow
-    // because only the added pages are shown)
-
-    int n = 0;
-    for ( wxNode *node = m_pages.First(); node; node = node->Next() )
-    {
-        wxNotebookPage *page = (wxNotebookPage*)node->Data();
+            GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-        if (page->WasAdded()) n++;
+            gpointer cur = notebook->cur_page;
+            if ( cur != NULL )
+            {
+                wxConstCast(this, wxNotebook)->m_selection =
+                    g_list_index( pages, cur );
+            }
+        }
     }
 
-    return n;
-}
-
-int wxNotebook::GetRowCount() const
-{
-    return 1;
+    return m_selection;
 }
 
 wxString wxNotebook::GetPageText( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_text;
     else
-        return "";
+        return wxT("");
 }
 
 int wxNotebook::GetPageImage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_image;
     else
-        return 0;
+        return -1;
 }
 
-wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") );
-
-    wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
-
-    wxNode *node = m_pages.First();
-    while (node)
-    {
-        nb_page = (wxNotebookPage*)node->Data();
-        if (nb_page->m_id == page)
-            return nb_page;
-        node = node->Next();
-    }
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
 
-    wxFAIL_MSG( _T("Notebook page not found!") );
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
 
-    return (wxNotebookPage *) NULL;
+    return m_pagesData.Item(page)->GetData();
 }
 
 int wxNotebook::SetSelection( int page )
 {
-    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    int selOld = GetSelection();
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-
-    if (!nb_page) return -1;
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
 
-    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;
-    }
+    int selOld = GetSelection();
 
-    if (!child) return -1;
+    // cache the selection
+    m_selection = page;
+    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
-    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();
 
     return selOld;
 }
 
-void wxNotebook::AdvanceSelection( bool bForward )
-{
-    wxCHECK_RET( m_widget != NULL, _T("invalid notebook") );
-
-    int sel = GetSelection();
-    int max = GetPageCount();
-
-    if (bForward)
-        SetSelection( sel == max ? 0 : sel + 1 );
-    else
-        SetSelection( sel == 0 ? max-1 : sel - 1 );
-}
-
-void wxNotebook::SetImageList( wxImageList* imageList )
-{
-    m_imageList = imageList;
-}
-
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
-    wxCHECK_MSG( nb_page, FALSE, _T("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, nb_page->m_text.mbc_str());
-   
+    gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );
+
     return TRUE;
 }
 
@@ -439,7 +417,7 @@ bool wxNotebook::SetPageImage( int page, int image )
 {
     /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
 
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
 
@@ -466,20 +444,20 @@ bool wxNotebook::SetPageImage( int page, int image )
 
         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;
+            {
+                pixmapwid = GTK_WIDGET(child->data);
+                break;
             }
-	    child = child->next;
-	}
+            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;
@@ -522,117 +500,113 @@ bool wxNotebook::SetPageImage( int page, int image )
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
-    wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") );
+    wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-    wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") );
+    wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
 }
 
-void wxNotebook::SetTabSize(const wxSize& sz)
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 {
-    wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") );
+    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
 }
 
 bool wxNotebook::DeleteAllPages()
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("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();
-
-        DeletePage( page->m_id );
+    while (m_pagesData.GetCount() > 0)
+        DeletePage( m_pagesData.GetCount()-1 );
 
-        page_node = m_pages.First();
-    }
+    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
 
-    return TRUE;
+    return wxNotebookBase::DeleteAllPages();
 }
 
 bool wxNotebook::DeletePage( int page )
 {
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page) return FALSE;
-
-    int page_num = 0;
-    GList *child = GTK_NOTEBOOK(m_widget)->children;
-    while (child)
+    // 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 )
     {
-        if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
-        page_num++;
-        child = child->next;
+        m_selection = GetSelection();
+        if ( m_selection == (int)m_pagesData.GetCount() - 1 )
+        {
+            // the index will become invalid after the page is deleted
+            m_selection = -1;
+        }
     }
 
-    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
+    // it will call our DoRemovePage() to do the real work
+    return wxNotebookBase::DeletePage(page);
+}
 
-    delete nb_page->m_client;
+wxNotebookPage *wxNotebook::DoRemovePage( int page )
+{
+    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    if ( !client )
+        return NULL;
 
-    m_pages.DeleteObject( nb_page );
+    gtk_widget_ref( client->m_widget );
+    gtk_widget_unrealize( client->m_widget );
+    gtk_widget_unparent( client->m_widget );
 
-    /* adjust the notebook page numbers so that
-       m_id reflects the current position, Daniel Paull */ 
-    int count = 0;
-    wxNode *node = m_pages.First();
-    wxNotebookPage *pagePtr = (wxNotebookPage *) NULL;
-    while (node)
-    {
-        pagePtr = (wxNotebookPage*)node->Data();
-        pagePtr->m_id = count++;
-        node = node->Next();
-    }
-    
-    return TRUE;
+    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
+
+    m_pagesData.DeleteObject(GetNotebookPage(page));
+
+    return client;
 }
 
-bool wxNotebook::RemovePage( int page )
+bool wxNotebook::InsertPage( int 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!") );
 
-    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
+    wxCHECK_MSG( position >= 0 && position <= GetPageCount(), FALSE,
+                 _T("invalid page index in wxNotebookPage::InsertPage()") );
 
-    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+    /* 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 );
 
-    m_pages.DeleteObject( nb_page );
+    if (m_themeEnabled)
+        win->SetThemeEnabled(TRUE);
 
-    return TRUE;
-}
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool select, int imageId)
-{
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
+    wxGtkNotebookPage *page = new wxGtkNotebookPage();
 
-    /* we've created the notebook page in AddChild(). Now we just have to set
-       the caption for the page and set the others parameters. */
+    if ( position == GetPageCount() )
+        m_pagesData.Append( page );
+    else
+        m_pagesData.Insert( m_pagesData.Item( position ), page );
 
-    wxNotebookPage *page = (wxNotebookPage *) NULL;
+    m_pages.Insert(win, position);
 
-    wxNode *node = m_pages.First();
-    while (node)
-    {
-        page = (wxNotebookPage*)node->Data();
-        if ( page->m_client == win ) break;
-        node = node->Next();
-    }
+    page->m_box = gtk_hbox_new( FALSE, 0 );
+    gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
 
-    wxCHECK_MSG( page != NULL, FALSE,
-               _T("Can't add a page whose parent is not the notebook!") );
+    gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
+      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+
+    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 );
 
-    wxCHECK_MSG( page->Add(), FALSE,
-               _T("Can't add the same page twice to a notebook.") );
+    page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
+
+    /* set the label image */
+    page->m_image = imageId;
 
     if (imageId != -1)
     {
@@ -653,19 +627,26 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
         gtk_widget_show(pixmapwid);
     }
 
-    /* then set the attributes */
+    /* set the label text */
     page->m_text = text;
-    if (page->m_text.IsEmpty()) page->m_text = _T("");
-    page->m_image = imageId;
-    page->m_label = (GtkLabel *)gtk_label_new(page->m_text.mbc_str());
-    gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+    if (page->m_text.IsEmpty()) page->m_text = wxT("");
 
-    /* @@@: what does this do? do we still need it?
-    gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
+    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 );
 
-    gtk_widget_show((GtkWidget *)page->m_label);
+    /* show the label */
+    gtk_widget_show( GTK_WIDGET(page->m_label) );
 
-    if (select) SetSelection( GetPageCount()-1 );
+    if (select && (m_pagesData.GetCount() > 1))
+    {
+        if (position < 0)
+            SetSelection( GetPageCount()-1 );
+        else
+            SetSelection( position );
+    }
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     return TRUE;
 }
@@ -678,16 +659,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         event.Skip();
 }
 
-wxWindow *wxNotebook::GetPage( int page ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("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) )
@@ -701,15 +673,26 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
     return TRUE;
 }
 
+#endif
+
 void wxNotebook::ApplyWidgetStyle()
 {
+    // TODO, font for labels etc
+
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+{
+    return ((m_widget->window == window) ||
+            (NOTEBOOK_PANEL(m_widget) == window));
+}
+
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
+#endif