X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53010e52d3adc63d2771263e294714bf644fc979..993da3969b28e4f80b492cc26114fb0e151163cb:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index c58f048ccb..ef02dbb756 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -2,388 +2,876 @@
 // Name:        notebook.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
+// 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
+
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/bitmap.h"
+#include "wx/fontutil.h"
+
+#include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
+
+#include <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
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
-// wxNotebookPage
+// data
 //-----------------------------------------------------------------------------
 
-class wxNotebookPage: public wxObject
-{
-  public:
-  
-   int                m_id;
-   wxString           m_text;
-   int                m_image;
-   void              *m_clientData;
-   GtkNotebookPage   *m_page;
-   wxPanel           *m_clientPanel;
-   
-   wxNotebookPage(void)
-   {
-     m_id = -1;
-     m_text = "";
-     m_image = -1;
-     m_clientData = NULL;
-     m_page = NULL;
-     m_clientPanel = NULL;
-   };
-   
+extern bool g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// wxGtkNotebookPage
+//-----------------------------------------------------------------------------
+
+// VZ: this is rather ugly as we keep the pages themselves in an array (it
+//     allows us to have quite a few functions implemented in the base class)
+//     but the page data is kept in a separate list, so we must maintain them
+//     in sync manually... of course, the list had been there before the base
+//     class which explains it but it still would be nice to do something
+//     about this one day
+
+class wxGtkNotebookPage: public wxObject
+{
+public:
+    wxGtkNotebookPage()
+    {
+        m_image = -1;
+        m_page = (GtkNotebookPage *) NULL;
+        m_box = (GtkWidget *) NULL;
+        m_labelStyle = (GtkStyle*) NULL;
+    }
+    
+    ~wxGtkNotebookPage()
+    {
+        if (m_labelStyle)
+            gtk_style_unref( m_labelStyle );
+    }
+    
+    bool SetFont(const wxFont& font);
+
+    wxString           m_text;
+    int                m_image;
+    GtkNotebookPage   *m_page;
+    GtkLabel          *m_label;
+    GtkWidget         *m_box;     // in which the label and image are packed
+    GtkStyle          *m_labelStyle;
 };
 
+
+bool wxGtkNotebookPage::SetFont(const wxFont& font)
+{
+    if (!m_label)
+		return false;
+
+    if (m_labelStyle)
+    {
+        GtkStyle *remake = gtk_style_copy( m_labelStyle );
+
+#ifndef __WXGTK20__
+        remake->klass = m_labelStyle->klass;
+#endif
+
+        gtk_style_unref( m_labelStyle );
+        m_labelStyle = remake;
+    }
+    else
+    {
+        GtkStyle *def = gtk_rc_get_style( GTK_WIDGET(m_label) );
+
+        if (!def)
+            def = gtk_widget_get_default_style();
+
+        m_labelStyle = gtk_style_copy( def );
+
+        // FIXME: no more klass in 2.0
+#ifndef __WXGTK20__
+        m_labelStyle->klass = def->klass;
+#endif
+    }
+
+#ifdef __WXGTK20__
+	pango_font_description_free( m_labelStyle->font_desc );
+	m_labelStyle->font_desc = pango_font_description_copy( font.GetNativeFontInfo()->description );
+#else
+	gdk_font_unref( m_labelStyle->font );
+	m_labelStyle->font = gdk_font_ref( font.GetInternalFont( 1.0 ) );
+#endif
+
+    gtk_widget_set_style( GTK_WIDGET(m_label), m_labelStyle );
+
+	return true;
+}
+
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGtkNotebookPagesList);
+
+
+//-----------------------------------------------------------------------------
+// "switch_page"
+//-----------------------------------------------------------------------------
+
+static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
+                                              GtkNotebookPage *WXUNUSED(page),
+                                              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 eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+                                   notebook->GetId(), page, old );
+    eventChanging.SetEventObject( notebook );
+
+    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 );
+    }
+
+    notebook->m_inSwitchPage = FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if ((win->m_x == alloc->x) &&
+        (win->m_y == alloc->y) &&
+        (win->m_width == alloc->width) &&
+        (win->m_height == alloc->height))
+    {
+        return;
+    }
+
+    win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+
+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate
+       here in order to make repositioning after resizing to take effect. */
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+        (gtk_micro_version < 6) &&
+        (win->m_wxwindow) &&
+        (GTK_WIDGET_REALIZED(win->m_wxwindow)))
+    {
+        gtk_widget_size_allocate( win->m_wxwindow, alloc );
+    }
+}
+
+//-----------------------------------------------------------------------------
+// "realize" from m_widget
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
+       here in order to make repositioning before showing to take effect. */
+    gtk_widget_queue_resize( win->m_widget );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    /* win is a control: tab can be propagated up */
+    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    {
+        int sel = win->GetSelection();
+        if (sel == -1)
+            return TRUE;
+        wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel);
+        wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
+
+        wxNavigationKeyEvent event;
+        event.SetEventObject( win );
+        /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
+        event.SetDirection( (gdk_event->keyval == GDK_Tab) );
+        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+        event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
+        event.SetCurrentFocus( win );
+
+        wxNotebookPage *client = win->GetPage(sel);
+        if ( !client->GetEventHandler()->ProcessEvent( event ) )
+        {
+             client->SetFocus();
+        }
+
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+{
+    // Hack alert! We manually set the child window
+    // parent field so that GTK can query the 
+    // notebook's style and font. Without that, GetBestSize could return
+    // incorrect size, see bug #901694 for details
+    // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)
+    child->m_widget->parent = parent->m_widget;
+}
+
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+void wxNotebook::Init()
+{
+    m_padding = 0;
+    m_inSwitchPage = FALSE;
+
+    m_imageList = (wxImageList *) NULL;
+    m_selection = -1;
+    m_themeEnabled = TRUE;
+}
 
-wxNotebook::wxNotebook(void)
+wxNotebook::wxNotebook()
 {
-  m_imageList = NULL;
-  m_frame = NULL;
-  m_pages.DeleteContents( TRUE );
-};
+    Init();
+}
 
-wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id, 
+wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
-      const long style, const wxString& name )
+      long style, const wxString& name )
 {
-  m_imageList = NULL;
-  m_frame = NULL;
-  m_pages.DeleteContents( TRUE );
-  Create( parent, id, pos, size, style, name );
-};
+    Init();
+    Create( parent, id, pos, size, style, name );
+}
 
-wxNotebook::~wxNotebook(void)
+wxNotebook::~wxNotebook()
 {
-  if (m_imageList) delete m_imageList;
-  DeleteAllPages();
-};
+    DeleteAllPages();
+}
 
-bool wxNotebook::Create(wxWindow *parent, const wxWindowID id, 
-      const wxPoint& pos, const wxSize& size,
-      const long style, const wxString& name )
-{
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-
-  m_widget = gtk_notebook_new();
-  
-  PostCreation();
-  
-  Show( TRUE );
-  
-  return TRUE;
-};
+bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name )
+{
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
-int wxNotebook::GetSelection(void) const
-{
-  if (m_pages.Number() == 0) return -1;
-
-  GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-  
-  wxNotebookPage *page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if (page->m_page == g_page) break;
-    node = node->Next();
-  };
-  
-  if (!node) wxFatalError( "Notebook error." );
-  
-  return page->m_id;
-};
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+        return FALSE;
+    }
 
-wxImageList* wxNotebook::GetImageList(void) const
-{
-  return m_imageList;
-};
 
-int wxNotebook::GetPageCount(void) const
+    m_widget = gtk_notebook_new();
+
+    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 );
+
+    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;
+}
+
+int wxNotebook::GetSelection() const
 {
-  return m_pages.Number();
-};
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+
+    if ( m_selection == -1 )
+    {
+        GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 
-int wxNotebook::GetRowCount(void) const
+        if (g_list_length(nb_pages) != 0)
+        {
+            GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+
+            gpointer cur = notebook->cur_page;
+            if ( cur != NULL )
+            {
+                wxConstCast(this, wxNotebook)->m_selection =
+                    g_list_index( nb_pages, cur );
+            }
+        }
+    }
+
+    return m_selection;
+}
+
+wxString wxNotebook::GetPageText( size_t page ) const
 {
-  return 1;
-};
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
+
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_text;
+    else
+        return wxT("");
+}
 
-wxString wxNotebook::GetPageText( const int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
 {
-  wxNotebookPage *nb_page = NULL;
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return "";
-  
-  return nb_page->m_text;
-};
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_image;
+    else
+        return -1;
+}
 
-int wxNotebook::GetPageImage( const int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-  wxNotebookPage *nb_page = NULL;
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return -1;
-  
-  return nb_page->m_image;
-};
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
+
+    return m_pagesData.Item(page)->GetData();
+}
 
-void* wxNotebook::GetPageData( const int page ) const
+int wxNotebook::SetSelection( size_t page )
 {
-  wxNotebookPage *nb_page = NULL;
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return NULL;
-  
-  return nb_page->m_clientData;
-};
+    wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
 
-int wxNotebook::SetSelection( const int page )
-{
-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return -1;
-  
-  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;
-  };
-   
-  if (!child) return -1;
-  
-  gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
-  
-  return page;
-};
+    int selOld = GetSelection();
+
+    // cache the selection
+    m_selection = page;
+    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
+
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();
 
-void wxNotebook::SetImageList( wxImageList* imageList )
+    return selOld;
+}
+
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {
-  m_imageList = imageList;
-};
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-bool wxNotebook::SetPageText( const int page, const wxString &text )
-{
-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
-  
-  nb_page->m_text = text;
- 
-  // recreate
-   
-  return TRUE;
-};
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
-bool wxNotebook::SetPageImage( const int page, const int image )
-{
-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
-  
-  nb_page->m_image = image;
- 
-  // recreate
-   
-  return TRUE;
-};
+    wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
 
-bool wxNotebook::SetPageData( const int page, void* data )
-{
-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
-  
-  nb_page->m_clientData = data;
-  
-  return TRUE;
-};
+    nb_page->m_text = text;
+
+    gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
+
+    return TRUE;
+}
+
+bool wxNotebook::SetPageImage( size_t page, int image )
+{
+    /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
+
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+
+    if (!nb_page) return FALSE;
+
+    /* Optimization posibility: return immediately if image unchanged.
+     * Not enabled because it may break existing (stupid) code that
+     * manipulates the imagelist to cycle images */
+
+    /* if (image == nb_page->m_image) return TRUE; */
+
+    /* 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)
+    {
+        /* 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) */
+        }
+    }
+
+    /* 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, m_padding);
+        gtk_widget_show(pixmapwid);
+    }
+    else
+    {
+        /* Case 4) Simply replace the pixmap */
+        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+    }
+
+    nb_page->m_image = image;
+
+    return TRUE;
+}
 
 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 )
 {
- //  what's this ?
-};
+    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))
+{
+    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+}
 
-bool wxNotebook::DeleteAllPages(void)
+bool wxNotebook::DeleteAllPages()
 {
-  wxNode *page_node = m_pages.First();
-  while (page_node)
-  {
-    wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
-    
-    DeletePage( page->m_id );
-    
-    page_node = m_pages.First();
-  };
-  
-  return TRUE;
-};
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-bool wxNotebook::DeletePage( const int page )
-{
-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
-
-  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;
-  };
-
-  wxASSERT( child );
-        
-  delete nb_page->m_clientPanel;
-  
-//  Amazingly, this is not necessary
-//  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
-  
-  m_pages.DeleteObject( nb_page );
-    
-  return TRUE;
-};
+    while (m_pagesData.GetCount() > 0)
+        DeletePage( m_pagesData.GetCount()-1 );
 
-wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data )
+    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+
+    return wxNotebookBase::DeleteAllPages();
+}
+
+bool wxNotebook::DeletePage( size_t page )
 {
-  wxNotebookPage *page = new wxNotebookPage;
-  
-  page->m_text = text;
-  if (page->m_text.IsNull()) page->m_text = "";
-  page->m_id = item;
-  page->m_image = imageId;
-  page->m_clientData = data;
-  
-  m_frame = gtk_label_new( page->m_text );
-  gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
+    if ( m_selection == (int)m_pagesData.GetCount() - 1 )
+    {
+        // the index will become invalid after the page is deleted
+        m_selection = -1;
+    }
 
-  page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
-    
-  m_frame = NULL;
-  
-  page->m_page = (GtkNotebookPage*)( g_list_last( GTK_NOTEBOOK(m_widget)->children )->data );
-  
-  if (!page->m_page) wxFatalError( "Notebook page creation error" );
-  
-  m_pages.Append( page );
-
-  return page->m_clientPanel;
-};
+    // it will call our DoRemovePage() to do the real work
+    return wxNotebookBase::DeletePage(page);
+}
 
-wxPanel *wxNotebook::GetPanel( const int page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
-  wxNotebookPage *nb_page = NULL;
+    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    if ( !client )
+        return NULL;
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return NULL;
-  
-  return nb_page->m_clientPanel;
-};
+    gtk_widget_ref( client->m_widget );
+    gtk_widget_unrealize( client->m_widget );
+    gtk_widget_unparent( client->m_widget );
+
+    // 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 );
 
-void wxNotebook::AddChild( wxWindow *win )
+    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
+
+    wxGtkNotebookPage* p = GetNotebookPage(page);
+    m_pagesData.DeleteObject(p);
+    delete p;
+
+    return client;
+}
+
+bool wxNotebook::InsertPage( size_t position,
+                             wxNotebookPage* win,
+                             const wxString& text,
+                             bool select,
+                             int imageId )
 {
-  if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
-  
-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
-};
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-//-----------------------------------------------------------------------------
-// wxTabEvent
-//-----------------------------------------------------------------------------
+    wxCHECK_MSG( win->GetParent() == this, FALSE,
+               wxT("Can't add a page whose parent is not the notebook!") );
+
+    wxCHECK_MSG( position <= GetPageCount(), FALSE,
+                 _T("invalid page index in wxNotebookPage::InsertPage()") );
+
+    // Hack alert part II! See above in InsertChildInNotebook
+    // callback why this has to be done.
+    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);
 
-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
-  wxCommandEvent(commandType, id)
+    wxGtkNotebookPage *nb_page = new wxGtkNotebookPage();
+
+    if ( position == GetPageCount() )
+        m_pagesData.Append( nb_page );
+    else
+        m_pagesData.Insert( m_pagesData.Item( position ), nb_page );
+
+    m_pages.Insert(win, position);
+
+    nb_page->m_box = gtk_hbox_new( FALSE, 1 );
+    gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 );
+
+    gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
+      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+
+#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
+#endif
+     gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
+
+    nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
+
+    /* set the label image */
+    nb_page->m_image = imageId;
+
+    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() )
+        {
+            mask = bmp->GetMask()->GetBitmap();
+        }
+
+        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
+
+        gtk_widget_show(pixmapwid);
+    }
+
+    /* set the label text */
+
+    nb_page->m_text = text;
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
+
+    nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
+	nb_page->SetFont(GetFont());
+    gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
+
+    /* 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
+#endif
+	    SetSelection( position );
+    }
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
+
+    return TRUE;
+}
+
+// helper for HitTest(): check if the point lies inside the given widget which
+// is the child of the notebook whose position and border size are passed as
+// parameters
+static bool
+IsPointInsideWidget(const wxPoint& pt, GtkWidget *w,
+                    gint x, gint y, gint border = 0)
 {
-};
+    return
+        (pt.x >= w->allocation.x - x - border) &&
+        (pt.x <= w->allocation.x - x + border + w->allocation.width) &&
+        (pt.y >= w->allocation.y - y - border) &&
+        (pt.y <= w->allocation.y - y + border + w->allocation.height);
+}
+
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
+{
+    const gint x = m_widget->allocation.x;
+    const gint y = m_widget->allocation.y;
+
+    const size_t count = GetPageCount();
+    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)
+{
+    if (event.IsWindowChange())
+        AdvanceSelection( event.GetDirection() );
+    else
+        event.Skip();
+}
+
+#if wxUSE_CONSTRAINTS
+
+// override these 2 functions to do nothing: everything is done in OnSize
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
+{
+    // don't set the sizes of the pages - their correct size is not yet known
+    wxControl::SetConstraintSizes(FALSE);
+}
+
+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));
+}
+
+bool  wxNotebook::SetFont(const wxFont& font)
+{
+	bool rc=wxNotebookBase::SetFont(font);
+
+	if (rc)
+	{
+		size_t i;
+		for (i=0 ; i < m_pagesData.GetCount() ; i++)
+			GetNotebookPage(i)->SetFont(font);
+	}
+	return rc;
+}
+
+//-----------------------------------------------------------------------------
+// wxNotebookEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+
+#endif