Compile fix.

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 39bb7904177fe195eff3799f266912dbd697ed6f..427e65677cd3c59340d9d929b354198ad346747e 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -1,433 +1,888 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.cpp
+// Name:        src/gtk/notebook.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_NOTEBOOK

 
 #include "wx/notebook.h"
 
 #include "wx/notebook.h"

-#include "wx/panel.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+    #include "wx/msgdlg.h"
+    #include "wx/bitmap.h"
+#endif
+

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/intl.h"
-#include "wx/log.h"
+#include "wx/fontutil.h"
+
+// FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
+#include "wx/gtk/private.h"
+#include "wx/gtk/win_gtk.h"
+
+#include <gdk/gdkkeysyms.h>
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxNotebookPage
+// data

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxNotebookPage: public wxObject
+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:
 {
 public:

-  wxNotebookPage()
-  {
-    m_id = -1;
-    m_text = "";
-    m_image = -1;
-    m_page = NULL;
-    m_client = NULL;
-    m_parent = NULL;
-  };
-
-//private:
-  int                m_id;
-  wxString           m_text;
-  int                m_image;
-  GtkNotebookPage   *m_page;
-  GtkLabel          *m_label;
-  wxWindow          *m_client;
-  GtkNotebook       *m_parent;
+    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)
+
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// GTK callbacks
+// "switch_page"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-// page change callback
+extern "C" {

 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),

-                                              GtkNotebookPage *WXUNUSED(page),
-                                              gint nPage,
-                                              gpointer data)
+                                              GtkNotebookPage *WXUNUSED(gpage),
+                                              guint page,
+                                              wxNotebook *notebook )
+{
+    // are you trying to call SetSelection() from a notebook event handler?
+    // you shouldn't!
+    wxCHECK_RET( !notebook->m_inSwitchPage,
+                 _T("gtk_notebook_page_change_callback reentered") );
+
+    notebook->m_inSwitchPage = true;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    int old = notebook->GetSelection();
+
+
+    if (notebook->m_skipNextPageChangeEvent)
+    {
+        // this event was programatically generated by ChangeSelection() and thus must
+        // be skipped
+        notebook->m_skipNextPageChangeEvent = false;
+
+        // 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;
+    }
+    else
+    {
+        if ( !notebook->SendPageChangingEvent(page) )
+        {
+            // program doesn't allow the page change
+            g_signal_stop_emission_by_name(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;
+
+            notebook->SendPageChangedEvent(old);
+        }
+    }
+
+    notebook->m_inSwitchPage = false;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if ((win->m_x == alloc->x) &&
+        (win->m_y == alloc->y) &&
+        (win->m_width == alloc->width) &&
+        (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
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
+       here in order to make repositioning before showing to take effect. */
+    gtk_widget_queue_resize( win->m_widget );
+}
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_notebook_key_press_callback( GtkWidget   *widget,
+                                 GdkEventKey *gdk_event,
+                                 wxNotebook  *notebook )

 {
 {

-  wxNotebook *notebook = (wxNotebook *)data;
+    // don't need to install idle handler, its done from "event" signal
+
+    if (!notebook->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    /* win is a control: tab can be propagated up */
+    if ((gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right))
+    {
+        int page;
+        int nMax = notebook->GetPageCount();
+        if ( nMax-- ) // decrement it to get the last valid index
+        {
+            int nSel = notebook->GetSelection();
+
+            // change selection wrapping if it becomes invalid
+            page = (gdk_event->keyval != GDK_Left) ? nSel == nMax ? 0
+                                       : nSel + 1
+                        : nSel == 0 ? nMax
+                                    : nSel - 1;
+        }
+        else // notebook is empty, no next page
+        {
+            return FALSE;
+        }
+
+        // m_selection = page;
+        gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page );
+
+        return TRUE;
+    }
+
+    /* win is a control: tab can be propagated up */
+    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    {
+        int sel = notebook->GetSelection();
+        if (sel == -1)
+            return TRUE;
+        wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
+        wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
+
+        wxNavigationKeyEvent event;
+        event.SetEventObject( notebook );
+        /* 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) ||
+                               (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) );
+        event.SetCurrentFocus( notebook );
+
+        wxNotebookPage *client = notebook->GetPage(sel);
+        if ( !client->GetEventHandler()->ProcessEvent( event ) )
+        {
+             client->SetFocus();
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+}

 
 

-  int nOld = notebook->GetSelection();
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------

 
 

-  // TODO: emulate PAGE_CHANGING event
-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                        notebook->GetId(),
-                        nPage,
-                        nOld);
-  event.SetEventObject(notebook);
-  notebook->ProcessEvent(event);
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+{
+    // Hack Alert! (Part I): This sets the notebook as the parent of the child
+    // widget, and takes care of some details such as updating the state and
+    // style of the child to reflect its new location.  We do this early
+    // because without it GetBestSize (which is used to set the initial size
+    // of controls if an explicit size is not given) will often report
+    // incorrect sizes since the widget's style context is not fully known.
+    // See bug #901694 for details
+    // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)
+    gtk_widget_set_parent(child->m_widget, parent->m_widget);
+
+    // NOTE: This should be considered a temporary workaround until we can
+    // work out the details and implement delaying the setting of the initial
+    // size of widgets until the size is really needed.

 }
 
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+

 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)

-  EVT_SIZE(wxNotebook::OnSize)
+    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
-

 void wxNotebook::Init()
 {
 void wxNotebook::Init()
 {

-  m_imageList = NULL;
-  m_pages.DeleteContents( TRUE );
-  m_idHandler = 0;
+    m_padding = 0;
+    m_inSwitchPage = false;
+    m_skipNextPageChangeEvent = false;
+
+    m_imageList = (wxImageList *) NULL;
+    m_selection = -1;
+    m_themeEnabled = true;

 }
 
 wxNotebook::wxNotebook()
 {
 }
 
 wxNotebook::wxNotebook()
 {

-  Init();
-};
+    Init();
+}

 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {

-  Init();
-  Create( parent, id, pos, size, style, name );
-};
+    Init();
+    Create( parent, id, pos, size, style, name );
+}

 
 wxNotebook::~wxNotebook()
 {
 
 wxNotebook::~wxNotebook()
 {

-  // don't generate change page events any more
-  if ( m_idHandler != 0 )
-    gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
-
-  if (m_imageList)
-    delete m_imageList;
-  DeleteAllPages();
-};
+    DeleteAllPages();
+}

 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 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_needParent = true;
+    m_acceptsFocus = true;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;

 
 

-  m_widget = gtk_notebook_new();
-  m_idHandler = gtk_signal_connect
-                (
-                  GTK_OBJECT(m_widget), "switch_page",
-                  GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
-                  (gpointer)this
-                );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+        return false;
+    }

 
 

-  PostCreation();

 
 

-  Show( TRUE );
+    m_widget = gtk_notebook_new();

 
 

-  return TRUE;
-};
+    gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );

 
 

-int wxNotebook::GetSelection() const
-{
-  if (m_pages.Number() == 0)
-    return -1;
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_change_callback), this);

 
 

-  GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+    m_parent->DoAddChild( this );

 
 

-  wxNotebookPage *page = NULL;
+    if (m_windowStyle & wxBK_RIGHT)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
+    if (m_windowStyle & wxBK_LEFT)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
+    if (m_windowStyle & wxBK_BOTTOM)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if (page->m_page == g_page)
-      break;
-    node = node->Next();
-  };
+    g_signal_connect (m_widget, "key_press_event",
+                      G_CALLBACK (gtk_notebook_key_press_callback), this);

 
 

-  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?");
+    PostCreation(size);

 
 

-  return page->m_id;
-};
+    g_signal_connect (m_widget, "realize",
+                      G_CALLBACK (gtk_notebook_realized_callback), this);

 
 

-int wxNotebook::GetPageCount() const
-{
-  return m_pages.Number();
-};
+    return true;
+}

 
 

-int wxNotebook::GetRowCount() const
+int wxNotebook::GetSelection() const

 {
 {

-  return 1;
-};
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+
+    if ( m_selection == -1 )
+    {
+        GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
+
+        if (g_list_length(nb_pages) != 0)
+        {
+            GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+
+            gpointer cur = notebook->cur_page;
+            if ( cur != NULL )
+            {
+                wxConstCast(this, wxNotebook)->m_selection =
+                    g_list_index( nb_pages, cur );
+            }
+        }
+    }
+
+    return m_selection;
+}

 
 

-wxString wxNotebook::GetPageText( int page ) const
+wxString wxNotebook::GetPageText( size_t page ) const

 {
 {

-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_text;
-  else
-    return "";
-};
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") );

 
 

-int wxNotebook::GetPageImage( int page ) const
-{
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_image;
-  else
-    return 0;
-};
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_text;
+    else
+        return wxEmptyString;
+}

 
 

-wxNotebookPage* wxNotebook::GetNotebookPage(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)
-      return nb_page;
-    node = node->Next();
-  };
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_image;
+    else
+        return -1;
+}

 
 

-  wxLogDebug( "Notebook page %d not found!", page );
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
+{
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );

 
 

-  return NULL;
-};
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
+
+    return m_pagesData.Item(page)->GetData();
+}

 
 

-int wxNotebook::SetSelection( int page )
+int wxNotebook::DoSetSelection( size_t page, int flags )

 {
 {

-  int selOld = GetSelection();
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return -1;
+    wxCHECK_MSG( m_widget != NULL, -1, 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( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );

 
 

-  if (!child) return -1;
+    int selOld = GetSelection();

 
 

-  gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+    if ( !(flags & SetSelection_SendEvent) )
+        m_skipNextPageChangeEvent = true;

 
 

-  return selOld;
-};
+    // cache the selection
+    m_selection = page;
+    gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );

 
 

-void wxNotebook::AdvanceSelection(bool bForward)
-{
-  int nSel = GetSelection(),
-      nMax = GetPageCount();
+#ifdef __WXDEBUG__
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        // gtk_notebook_set_current_page will emit the switch-page signal which will be
+        // caught by our gtk_notebook_page_change_callback which should have reset the
+        // flag to false:
+        wxASSERT(!m_skipNextPageChangeEvent);
+    }
+#endif // __WXDEBUG__
+
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();

 
 

-  if ( bForward ) {
-    SetSelection(nSel == nMax ? 0 : nSel + 1);
-  }
-  else {
-    SetSelection(nSel == 0 ? nMax : nSel - 1);
-  }
+    return selOld;

 }
 
 }
 

-void wxNotebook::SetImageList( wxImageList* imageList )
+bool wxNotebook::SetPageText( size_t page, const wxString &text )

 {
 {

-  m_imageList = imageList;
-};
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-bool wxNotebook::SetPageText( int page, const wxString &text )
-{
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return FALSE;
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);

 
 

-  nb_page->m_text = text;
+    wxCHECK_MSG( nb_page, false, wxT("SetPageText: invalid page index") );

 
 

-  return TRUE;
-};
+    nb_page->m_text = text;

 
 

-bool wxNotebook::SetPageImage( int page, int image )
-{
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return FALSE;
+    gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );

 
 

-  nb_page->m_image = image;
+    return true;
+}

 
 

-  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_get_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->GetBitmapPtr(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) )
 {
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {

-  wxFAIL_MSG("wxNotebook::SetPageSize not implemented");
-};
+    wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
+}

 
 

-void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
+void wxNotebook::SetPadding( const wxSize &padding )

 {
 {

-  wxFAIL_MSG("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))
+{
+    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+}

 
 bool wxNotebook::DeleteAllPages()
 {
 
 bool wxNotebook::DeleteAllPages()
 {

-  wxNode *page_node = m_pages.First();
-  while (page_node)
-  {
-    wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-    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;
-};
+    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;
+    if ( m_selection != -1 && (size_t)m_selection >= page )
+    {
+        // the index will become invalid after the page is deleted
+        m_selection = -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;
-  };
+    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    if ( !client )
+        return NULL;

 
 

-  wxASSERT( child );
+    gtk_widget_ref( client->m_widget );
+    gtk_widget_unrealize( client->m_widget );
+    gtk_widget_unparent( client->m_widget );

 
 

-  delete nb_page->m_client;
+    // 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
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) gtk_notebook_page_change_callback,
+                                          this);

 
 

-//  Amazingly, this is not necessary
-//  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );

 
 

-  m_pages.DeleteObject( nb_page );
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_change_callback), this);

 
 

-  return TRUE;
-};
+    wxGtkNotebookPage* p = GetNotebookPage(page);
+    m_pagesData.DeleteObject(p);
+    delete p;

 
 

-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool bSelect, int imageId)
+    return client;
+}
+
+bool wxNotebook::InsertPage( size_t position,
+                             wxNotebookPage* win,
+                             const wxString& text,
+                             bool select,
+                             int imageId )

 {
 {

-  // we've created the notebook page in AddChild(). Now we just have to set
-  // the caption for the page and set the others parameters.
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-  // first, find the page
-  wxNotebookPage *page = NULL;
+    wxCHECK_MSG( win->GetParent() == this, false,
+               wxT("Can't add a page whose parent is not the notebook!") );

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if ( page->m_client == win )
-      break; // found
-    node = node->Next();
-  };
+    wxCHECK_MSG( position <= GetPageCount(), false,
+                 _T("invalid page index in wxNotebookPage::InsertPage()") );

 
 

-  wxCHECK_MSG(page != NULL, FALSE,
-              "Can't add a page whose parent is not the notebook!");
+    // 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;

 
 

-  // then set the attributes
-  page->m_text = text;
-  if ( page->m_text.IsEmpty() )
-    page->m_text = "";
-  page->m_image = imageId;
-  gtk_label_set(page->m_label, page->m_text);
+    // don't receive switch page during addition
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) gtk_notebook_page_change_callback,
+                                          this);

 
 

-  if ( bSelect ) {
-    SetSelection(GetPageCount());
-  }
+    if (m_themeEnabled)
+        win->SetThemeEnabled(true);

 
 

-  return TRUE;
-};
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);

 
 

-wxWindow *wxNotebook::GetPage( int page ) const
-{
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return NULL;
-  else
-    return nb_page->m_client;
-};
+    wxGtkNotebookPage *nb_page = new wxGtkNotebookPage();

 
 

-void wxNotebook::AddChild( wxWindow *win )
-{
-  // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
-  // case is special there (Robert?)
-  // Robert: Don't you think the code below looks different from the one
-  // in wxWindow::AddChild :-)
+    if ( position == GetPageCount() )
+        m_pagesData.Append( nb_page );
+    else
+        m_pagesData.Insert( position, nb_page );

 
 

-  m_children.Append(win);
+    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 );

 
 

-  wxNotebookPage *page = new wxNotebookPage();
+    g_signal_connect (win->m_widget, "size_allocate",
+                      G_CALLBACK (gtk_page_size_callback), win);

 
 

-  page->m_id = GetPageCount();
-  page->m_label = (GtkLabel *)gtk_label_new("Handle");
-  page->m_client = win;
-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
-                            (GtkWidget *)page->m_label);
-  gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+    gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );

 
 

-  page->m_page =
-    (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
+    nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;

 
 

-  page->m_parent = GTK_NOTEBOOK(m_widget);
+    /* set the label image */
+    nb_page->m_image = imageId;

 
 

-  if (!page->m_page)
-  {
-     wxLogFatalError( "Notebook page creation error" );
-     return;
-  }
+    if (imageId != -1)
+    {
+        wxASSERT( m_imageList != NULL );

 
 

-  m_pages.Append( page );
-};
+        const wxBitmap *bmp = m_imageList->GetBitmapPtr(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 = wxStripMenuCodes(text);
+    if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;

 
 

-void wxNotebook::OnSize(wxSizeEvent& event)
+    nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
+    gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
+
+    /* apply current style */
+    GtkRcStyle *style = CreateWidgetStyle();
+    if ( style )
+    {
+        gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style);
+        gtk_rc_style_unref(style);
+    }
+
+    /* show the label */
+    gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
+    if (select && (m_pagesData.GetCount() > 1))
+    {
+      SetSelection( position );
+    }
+
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_change_callback), this);
+
+    InvalidateBestSize();
+    return true;
+}
+
+// helper for HitTest(): check if the point lies inside the given widget which
+// is the child of the notebook whose position and border size are passed as
+// parameters
+static bool
+IsPointInsideWidget(const wxPoint& pt, GtkWidget *w,
+                    gint x, gint y, gint border = 0)

 {
 {

-  // forward this event to all pages
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    wxWindow *page = ((wxNotebookPage*)node->Data())->m_client;
-    // @@@@ the numbers I substract here are completely arbitrary, instead we
-    // should somehow calculate the size of the page from the size of the
-    // notebook
-    page->SetSize(event.GetSize().GetX() - 5,
-                                 event.GetSize().GetY() - 30);
+    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);
+}

 
 

-    if ( page->GetAutoLayout() )
-      page->Layout();
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
+{
+    const gint x = m_widget->allocation.x;
+    const gint y = m_widget->allocation.y;
+
+    const size_t count = GetPageCount();
+    size_t i = 0;
+
+    GtkNotebook * notebook = GTK_NOTEBOOK(m_widget);
+    if (gtk_notebook_get_scrollable(notebook))
+        i = g_list_position( notebook->children, notebook->first_tab );
+
+    for ( ; i < count; i++ )
+    {
+        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+        GtkWidget *box = nb_page->m_box;
+
+        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
+
+        if ( IsPointInsideWidget(pt, box, x, y, border) )
+        {
+            // ok, we're inside this tab -- now find out where, if needed
+            if ( flags )
+            {
+                GtkWidget *pixmap = NULL;
+
+                GList *children = gtk_container_get_children(GTK_CONTAINER(box));
+                for ( GList *child = children; child; child = child->next )
+                {
+                    if ( GTK_IS_PIXMAP(child->data) )
+                    {
+                        pixmap = GTK_WIDGET(child->data);
+                        break;
+                    }
+                }
+
+                if ( children )
+                    g_list_free(children);
+
+                if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
+                {
+                    *flags = wxBK_HITTEST_ONICON;
+                }
+                else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
+                {
+                    *flags = wxBK_HITTEST_ONLABEL;
+                }
+                else
+                {
+                    *flags = wxBK_HITTEST_ONITEM;
+                }
+            }
+
+            return i;
+        }
+    }
+
+    if ( flags )
+    {
+        *flags = wxBK_HITTEST_NOWHERE;
+        wxWindowBase * page = GetCurrentPage();
+        if ( page )
+        {
+            // rect origin is in notebook's parent coordinates
+            wxRect rect = page->GetRect();
+
+            // adjust it to the notebook's coordinates
+            wxPoint pos = GetPosition();
+            rect.x -= pos.x;
+            rect.y -= pos.y;
+            if ( rect.Contains( pt ) )
+                *flags |= wxBK_HITTEST_ONPAGE;
+        }
+    }
+
+    return wxNOT_FOUND;
+}

 
 

-    node = node->Next();
-  };
+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
 // override these 2 functions to do nothing: everything is done in OnSize

-void wxNotebook::SetConstraintSizes(bool /* recurse */)
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )

 {
 {

-  // don't set the sizes of the pages - their correct size is not yet known
-  wxControl::SetConstraintSizes(FALSE);
+    // don't set the sizes of the pages - their correct size is not yet known
+    wxControl::SetConstraintSizes(false);

 }
 
 }
 

-bool wxNotebook::DoPhase(int /* nPhase */)
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )

 {
 {

-  return TRUE;
+    return true;
+}
+
+#endif
+
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    gtk_widget_modify_style(m_widget, style);
+    size_t cnt = m_pagesData.GetCount();
+    for (size_t i = 0; i < cnt; i++)
+        gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style);
+}
+
+GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+    windows.push_back(m_widget->window);
+    windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
+
+    return NULL;
+}
+
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);

 }
 
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+
+#endif