X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..024f89f972a6787e82d77fc5e5dac302a56abbb0:/src/gtk1/notebook.cpp

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 942914458c..c3dd7241a1 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/notebook.h"
 
 #if wxUSE_NOTEBOOK
@@ -20,12 +23,23 @@
 #include "wx/imaglist.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+#include "wx/bitmap.h"
+#include "wx/fontutil.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 "wx/msgdlg.h"
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
@@ -37,42 +51,41 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// 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
+    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"
 //-----------------------------------------------------------------------------
@@ -82,27 +95,42 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               gint 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") );
+
+    notebook->m_inSwitchPage = TRUE;
     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 );
+    wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+                                   notebook->GetId(), page, old );
+    eventChanging.SetEventObject( notebook );
 
-    if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
-        !event1.IsAllowed() )
+    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" );
-        return;
+        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 );
     }
 
-    wxNotebookEvent event2( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                            notebook->GetId(), page, old );
-    event2.SetEventObject( notebook );
-    notebook->GetEventHandler()->ProcessEvent( event2 );
+    notebook->m_inSwitchPage = FALSE;
 }
 
 //-----------------------------------------------------------------------------
@@ -128,9 +156,9 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
        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_micro_version < 6) &&
+        (win->m_wxwindow) &&
+        (GTK_WIDGET_REALIZED(win->m_wxwindow)))
     {
         gtk_widget_size_allocate( win->m_wxwindow, alloc );
     }
@@ -153,13 +181,67 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
     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( wxNotebook* 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.
 }
 
 //-----------------------------------------------------------------------------
@@ -174,9 +256,12 @@ END_EVENT_TABLE()
 
 void wxNotebook::Init()
 {
+    m_padding = 0;
+    m_inSwitchPage = FALSE;
+
     m_imageList = (wxImageList *) NULL;
-    m_pages.DeleteContents( TRUE );
-    m_lastSelection = -1;
+    m_selection = -1;
+    m_themeEnabled = TRUE;
 }
 
 wxNotebook::wxNotebook()
@@ -194,16 +279,12 @@ 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;
@@ -213,16 +294,12 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
         !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
-
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
@@ -230,147 +307,118 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     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 );
+    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();
+    gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
+      GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );
 
-    SetFont( parent->GetFont() );
+    PostCreation(size);
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 
-    Show( TRUE );
-
     return TRUE;
 }
 
-void wxNotebook::SetFocus()
-{
-    if (m_pages.GetCount() == 0) return;
-
-    wxNode *node = m_pages.Nth( GetSelection() );
-
-    if (!node) return;
-
-    wxNotebookPage *page = (wxNotebookPage*) node->Data();
-
-    page->m_client->SetFocus();
-}
-
 int wxNotebook::GetSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    GList *pages = GTK_NOTEBOOK(m_widget)->children;
-
-    if (g_list_length(pages) == 0) return -1;
-
-    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-
-    if (notebook->cur_page == NULL) return m_lastSelection;
+    if ( m_selection == -1 )
+    {
+        GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 
-    return g_list_index( pages, (gpointer)(notebook->cur_page) );
-}
+        if (g_list_length(nb_pages) != 0)
+        {
+            GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-int wxNotebook::GetPageCount() const
-{
-    return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
-}
+            gpointer cur = notebook->cur_page;
+            if ( cur != NULL )
+            {
+                wxConstCast(this, wxNotebook)->m_selection =
+                    g_list_index( nb_pages, cur );
+            }
+        }
+    }
 
-int wxNotebook::GetRowCount() const
-{
-    return 1;
+    return m_selection;
 }
 
-wxString wxNotebook::GetPageText( int page ) const
+wxString wxNotebook::GetPageText( size_t page ) const
 {
     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 wxT("");
 }
 
-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
 {
     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 -1;
 }
 
-wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") );
-
-    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
 
-    wxNode *node = m_pages.Nth( page );
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
 
-    return (wxNotebookPage *) node->Data();
+    return m_pagesData.Item(page)->GetData();
 }
 
-int wxNotebook::SetSelection( int page )
+int wxNotebook::SetSelection( size_t page )
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-    wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") );
+    wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
 
     int selOld = GetSelection();
 
+    // cache the selection
+    m_selection = page;
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
-    return selOld;
-}
-
-void wxNotebook::AdvanceSelection( bool forward )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();
 
-    int sel = GetSelection();
-    int max = GetPageCount();
-
-    if (forward)
-        SetSelection( sel == max ? 0 : sel + 1 );
-    else
-        SetSelection( sel == 0 ? max-1 : sel - 1 );
-}
-
-void wxNotebook::SetImageList( wxImageList* imageList )
-{
-    m_imageList = imageList;
+    return selOld;
 }
 
-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);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     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, wxGTK_CONV( nb_page->m_text ) );
 
     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);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
     if (!nb_page) return FALSE;
 
@@ -397,20 +445,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;
@@ -437,7 +485,7 @@ bool wxNotebook::SetPageImage( int page, int image )
         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_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
         gtk_widget_show(pixmapwid);
     }
     else
@@ -456,9 +504,31 @@ 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();
+
+    int i;
+    for (i=0; i<int(GetPageCount()); i++)
+    {
+        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+        wxASSERT(nb_page != NULL);
+
+        if (nb_page->m_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::SetTabSize(const wxSize& WXUNUSED(sz))
@@ -470,80 +540,106 @@ bool wxNotebook::DeleteAllPages()
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-    while (m_pages.GetCount() > 0)
-        DeletePage( m_pages.GetCount()-1 );
+    while (m_pagesData.GetCount() > 0)
+        DeletePage( m_pagesData.GetCount()-1 );
 
-    return TRUE;
+    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+
+    InvalidateBestSize();
+    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;
+    if ( m_selection != -1 && (size_t)m_selection >= page )
+    {
+        // the index will become invalid after the page is deleted
+        m_selection = -1;
+    }
 
-    return TRUE;
-}
+    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    if ( !client )
+        return NULL;
 
-bool wxNotebook::RemovePage( int page )
-{
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    gtk_widget_ref( client->m_widget );
+    gtk_widget_unrealize( client->m_widget );
+    gtk_widget_unparent( client->m_widget );
 
-    if (!nb_page) return FALSE;
+    // gtk_notebook_remove_page() sends "switch_page" signal with some strange
+    // new page index (when deleting selected page 0, new page is 1 although,
+    // clearly, the selection should stay 0), so suppress this
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
-    m_pages.DeleteObject( nb_page );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-    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( win->GetParent() == this, FALSE,
                wxT("Can't add a page whose parent is not the notebook!") );
 
-    /* don't receive switch page during addition */
+    wxCHECK_MSG( position <= GetPageCount(), FALSE,
+                 _T("invalid page index in wxNotebookPage::InsertPage()") );
+
+    // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
+    // why this has to be done.  NOTE: using gtk_widget_unparent here does not
+    // work as it seems to undo too much and will cause errors in the
+    // gtk_notebook_insert_page below, so instead just clear the parent by
+    // hand here.
+    win->m_widget->parent = NULL;
+
+    // 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 );
 
+    if (m_themeEnabled)
+        win->SetThemeEnabled(TRUE);
+
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-    wxNotebookPage *page = new wxNotebookPage();
+    wxGtkNotebookPage *nb_page = new wxGtkNotebookPage();
 
-    if (position < 0)
-        m_pages.Append( page );
+    if ( position == GetPageCount() )
+        m_pagesData.Append( nb_page );
     else
-        m_pages.Insert( m_pages.Nth( position ), page );
+        m_pagesData.Insert( m_pagesData.Item( position ), nb_page );
 
-    page->m_client = win;
+    m_pages.Insert(win, position);
 
-    page->m_box = gtk_hbox_new( FALSE, 0 );
-    gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
+    nb_page->m_box = gtk_hbox_new( FALSE, 1 );
+    gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 );
 
     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 );
+#ifndef __VMS
+   // On VMS position is unsigned and thus always positive
+   if (position < 0)
+        gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
     else
-        gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position );
+#endif
+     gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
 
-    page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
+    nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 
     /* set the label image */
-    page->m_image = imageId;
+    nb_page->m_image = imageId;
 
     if (imageId != -1)
     {
@@ -559,39 +655,120 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
 
         GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
 
-        gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
 
         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 );
+    nb_page->m_text = text;
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
 
-    /* show the label */
-    gtk_widget_show( GTK_WIDGET(page->m_label) );
+    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 );
 
-    if (select && (m_pages.GetCount() > 1))
+    /* 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))
     {
+#ifndef __VMS
+   // On VMS position is unsigned and thus always positive
         if (position < 0)
             SetSelection( GetPageCount()-1 );
-	else
-            SetSelection( position );
+        else
+#endif
+	    SetSelection( position );
     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
+    InvalidateBestSize();
     return TRUE;
 }
 
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool select, int imageId)
+// 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 InsertPage( -1, win, text, select, imageId );
+    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();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+        GtkWidget *box = nb_page->m_box;
+
+        // VZ: don't know how to find the border width in GTK+ 1.2
+#ifdef __WXGTK20__
+        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
+#else // !GTK+ 2.x
+        const gint border = 0;
+#endif
+        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_children(GTK_CONTAINER(box));
+                for ( GList *child = children; child; child = child->next )
+                {
+                    if ( GTK_IS_PIXMAP(child->data) )
+                    {
+                        pixmap = GTK_WIDGET(child->data);
+                        break;
+                    }
+                }
+
+                if ( children )
+                    g_list_free(children);
+
+                if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
+                {
+                    *flags = wxNB_HITTEST_ONICON;
+                }
+                else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
+                {
+                    *flags = wxNB_HITTEST_ONLABEL;
+                }
+                else
+                {
+                    *flags = wxNB_HITTEST_ONITEM;
+                }
+            }
+
+            return i;
+        }
+    }
+
+    if ( flags )
+        *flags = wxNB_HITTEST_NOWHERE;
+
+    return wxNOT_FOUND;
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
@@ -602,16 +779,7 @@ 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) )
@@ -625,18 +793,27 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
     return TRUE;
 }
 
-void wxNotebook::ApplyWidgetStyle()
+#endif
+
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    // TODO, font for labels etc
-    
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    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);
 }
 
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 {
     return ((m_widget->window == window) ||
-            (GTK_NOTEBOOK(m_widget)->panel == window));
+            (NOTEBOOK_PANEL(m_widget) == window));
+}
+
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
 }
 
 //-----------------------------------------------------------------------------