Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 76baec9d8ea386ce8c9464a2b505bbff5c4d015b..71ebdcf3a9290a92e3332e3c983728d34811c9eb 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -1,54 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_NOTEBOOK
+

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

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

 
 

-#include "wx/panel.h"
-#include "wx/utils.h"

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

-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/bitmap.h"
+#include "wx/fontutil.h"

 
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #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)
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool g_blockEventsOnDrag;
+#include "wx/gtk/private/gtk2-compat.h"

 
 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage
 
 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage


@@ -64,187 +42,100 @@ extern bool g_blockEventsOnDrag;
 class wxGtkNotebookPage: public wxObject
 {
 public:
 class wxGtkNotebookPage: public wxObject
 {
 public:

-  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
+    GtkWidget* m_box;
+    GtkWidget* m_label;
+    GtkWidget* m_image;
+    int m_imageIndex;

 };
 
 };
 

-#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 );
-    }
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGtkNotebookPagesList)

 
 

-    notebook->m_inSwitchPage = FALSE;
+extern "C" {
+static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "size_allocate"
+// "switch_page"

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

-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+extern "C" {
+static void
+switch_page_after(GtkNotebook* widget, GtkNotebookPage*, guint, wxNotebook* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);

 
 

-    if ((win->m_x == alloc->x) &&
-        (win->m_y == alloc->y) &&
-        (win->m_width == alloc->width) &&
-        (win->m_height == alloc->height))
-    {
-        return;
-    }
-
-    win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-
-    /* 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 );
-    }
+    win->GTKOnPageChanged();
+}

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// "realize" from m_widget
-//-----------------------------------------------------------------------------
-
-static gint
-gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
+extern "C" {
+static void
+switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    win->m_oldSelection = gtk_notebook_get_current_page(widget);

 
 

-    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
-       here in order to make repositioning before showing to take effect. */
-    gtk_widget_queue_resize( win->m_widget );
-
-    return FALSE;
+    if (win->SendPageChangingEvent(page))
+        // allow change, unblock handler for changed event
+        g_signal_handlers_unblock_by_func(widget, (void*)switch_page_after, win);
+    else
+        // change vetoed, unblock handler to set selection back
+        g_signal_handlers_unblock_by_func(widget, (void*)event_after, win);
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "key_press_event"
+// "event_after" from m_widget

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

-static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
+extern "C" {
+static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    g_signal_handlers_block_by_func(widget, (void*)event_after, win);
+    g_signal_handlers_block_by_func(widget, (void*)switch_page, win);

 
 

-    if (!win->m_hasVMT) return FALSE;
-    if (g_blockEventsOnDrag) return FALSE;
+    // restore previous selection
+    gtk_notebook_set_current_page(widget, win->m_oldSelection);

 
 

-    /* 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;
+    g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win);
+}

 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxNotebook
 //-----------------------------------------------------------------------------
 

-static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+void wxNotebook::AddChildGTK(wxWindowGTK* child)

 {
 {

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

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

-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
-
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)

     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 void wxNotebook::Init()
 {
     m_padding = 0;
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 void wxNotebook::Init()
 {
     m_padding = 0;

-    m_inSwitchPage = FALSE;
-
-    m_imageList = (wxImageList *) NULL;
-    m_selection = -1;
-    m_themeEnabled = TRUE;
+    m_oldSelection = -1;
+    m_themeEnabled = true;

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


@@ -269,115 +160,92 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );

-        return FALSE;
+        return false;

     }
 
 
     m_widget = gtk_notebook_new();
     }
 
 
     m_widget = gtk_notebook_new();

+    g_object_ref(m_widget);

 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
     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 );
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK(switch_page), this);
+
+    g_signal_connect_after (m_widget, "switch_page",
+                      G_CALLBACK(switch_page_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)switch_page_after, this);
+
+    g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this);
+    g_signal_handlers_block_by_func(m_widget, (void*)event_after, this);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    if (m_windowStyle & wxNB_RIGHT)
+    if (m_windowStyle & wxBK_RIGHT)

         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );

-    if (m_windowStyle & wxNB_LEFT)
+    if (m_windowStyle & wxBK_LEFT)

         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );

-    if (m_windowStyle & wxNB_BOTTOM)
+    if (m_windowStyle & wxBK_BOTTOM)

         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_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 );
+    PostCreation(size);

 
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 int wxNotebook::GetSelection() const
 {
 }
 
 int wxNotebook::GetSelection() const
 {

-    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);
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );

 
 

-            gpointer cur = notebook->cur_page;
-            if ( cur != NULL )
-            {
-                wxConstCast(this, wxNotebook)->m_selection =
-                    g_list_index( nb_pages, cur );
-            }
-        }
-    }
-
-    return m_selection;
+    return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );

 }
 
 wxString wxNotebook::GetPageText( size_t page ) const
 {
 }
 
 wxString wxNotebook::GetPageText( size_t page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
+    wxCHECK_MSG(page < GetPageCount(), wxEmptyString, "invalid notebook index");

 
 

-    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
-    if (nb_page)
-        return nb_page->m_text;
-    else
-        return wxT("");
+    GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+    return wxGTK_CONV_BACK(gtk_label_get_text(label));

 }
 
 int wxNotebook::GetPageImage( size_t page ) const
 {
 }
 
 int wxNotebook::GetPageImage( size_t page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");

 
 

-    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
-    if (nb_page)
-        return nb_page->m_image;
-    else
-        return -1;
+    return GetNotebookPage(page)->m_imageIndex;

 }
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
 }
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
-
-    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
-

     return m_pagesData.Item(page)->GetData();
 }
 
     return m_pagesData.Item(page)->GetData();
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
-
-    wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");

 
     int selOld = GetSelection();
 
 
     int selOld = GetSelection();
 

-    // cache the selection
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this);
+    }
+
+    gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
+
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
+    }
+

     m_selection = page;
     m_selection = page;

-    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );

 
     wxNotebookPage *client = GetPage(page);
     if ( client )
 
     wxNotebookPage *client = GetPage(page);
     if ( client )


@@ -386,109 +254,85 @@ int wxNotebook::SetSelection( size_t page )
     return selOld;
 }
 
     return selOld;
 }
 

-bool wxNotebook::SetPageText( size_t page, const wxString &text )
+void wxNotebook::GTKOnPageChanged()

 {
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
-
-    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    m_selection = gtk_notebook_get_current_page(GTK_NOTEBOOK(m_widget));

 
 

-    wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
+    SendPageChangedEvent(m_oldSelection);
+}

 
 

-    nb_page->m_text = text;
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
+{
+    wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");

 
 

-    gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
+    GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+    gtk_label_set_text(label, wxGTK_CONV(text));

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::SetPageImage( size_t 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 */
-
-    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 */
+    wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");

 
 

-    if (image == -1 && nb_page->m_image == -1)
-        return TRUE; /* Case 1): Nothing to do. */
-
-    GtkWidget *pixmapwid = (GtkWidget*) NULL;
-
-    if (nb_page->m_image != -1)
+    wxGtkNotebookPage* pageData = GetNotebookPage(page);
+    if (image >= 0)

     {
     {

-        /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */
-
-        GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
-        while (child)
+        wxCHECK_MSG(HasImageList(), false, "invalid notebook imagelist");
+        const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(image);
+        if (bitmap == NULL)
+            return false;
+        if (pageData->m_image)

         {
         {

-            if (GTK_IS_PIXMAP(child->data))
-            {
-                pixmapwid = GTK_WIDGET(child->data);
-                break;
-            }
-            child = child->next;
+            gtk_image_set_from_pixbuf(
+                GTK_IMAGE(pageData->m_image), bitmap->GetPixbuf());

         }
         }

-
-        /* We should have the pixmap widget now */
-        wxASSERT(pixmapwid != NULL);
-
-        if (image == -1)
+        else

         {
         {

-            /* 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) */
+            pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+            gtk_widget_show(pageData->m_image);
+            gtk_box_pack_start(GTK_BOX(pageData->m_box),
+                pageData->m_image, false, false, m_padding);

         }
     }
         }
     }

-
-    /* Only cases 3) and 4) left */
-    wxASSERT( m_imageList != NULL ); /* Just in case */
-
-    /* Construct the new pixmap */
-    const wxBitmap *bmp = m_imageList->GetBitmap(image);
-    GdkPixmap *pixmap = bmp->GetPixmap();
-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    if ( bmp->GetMask() )
+    else if (pageData->m_image)

     {
     {

-        mask = bmp->GetMask()->GetBitmap();
+        gtk_widget_destroy(pageData->m_image);
+        pageData->m_image = NULL;

     }
     }

+    pageData->m_imageIndex = image;

 
 

-    if (pixmapwid == NULL)
-    {
-        /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
-        pixmapwid = gtk_pixmap_new (pixmap, mask );
+    return true;
+}

 
 

-        /* 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
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // Compute the max size of the tab labels.
+    wxSize sizeTabMax;
+    const size_t pageCount = GetPageCount();
+    for ( size_t n = 0; n < pageCount; n++ )

     {
     {

-        /* Case 4) Simply replace the pixmap */
-        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+        GtkRequisition req;
+        gtk_widget_get_preferred_size(GetNotebookPage(n)->m_box, NULL, &req);
+        sizeTabMax.IncTo(wxSize(req.width, req.height));

     }
 
     }
 

-    nb_page->m_image = image;
+    // Unfortunately this doesn't account for the real tab size and I don't
+    // know how to find it, e.g. where do the margins below come from.
+    const int PAGE_MARGIN = 3;
+    const int TAB_MARGIN = 4;

 
 

-    return TRUE;
-}
+    sizeTabMax.IncBy(3*TAB_MARGIN);

 
 

-void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
-{
-    wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
+    wxSize sizeFull(sizePage);
+    if ( IsVertical() )
+        sizeFull.y += sizeTabMax.y;
+    else
+        sizeFull.x += sizeTabMax.x;
+
+    sizeFull.IncBy(2*PAGE_MARGIN);
+
+    return sizeFull;

 }
 
 void wxNotebook::SetPadding( const wxSize &padding )
 }
 
 void wxNotebook::SetPadding( const wxSize &padding )


@@ -497,24 +341,16 @@ void wxNotebook::SetPadding( const wxSize &padding )
 
     m_padding = padding.GetWidth();
 
 
     m_padding = padding.GetWidth();
 

-    int i;
-    for (i=0; i<int(GetPageCount()); i++)
+    for (size_t i = GetPageCount(); i--;)

     {
     {

-        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
-        wxASSERT(nb_page != NULL);
-
-        if (nb_page->m_image != -1)
+        wxGtkNotebookPage* pageData = GetNotebookPage(i);
+        if (pageData->m_image)

         {
         {

-            // 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);
+            gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+                pageData->m_image, false, false, m_padding, GTK_PACK_START);

         }
         }

-        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);
+        gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+            pageData->m_label, false, false, m_padding, GTK_PACK_END);

     }
 }
 
     }
 }
 


@@ -525,48 +361,30 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 
 bool wxNotebook::DeleteAllPages()
 {
 
 bool wxNotebook::DeleteAllPages()
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
-
-    while (m_pagesData.GetCount() > 0)
-        DeletePage( m_pagesData.GetCount()-1 );
-
-    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+    for (size_t i = GetPageCount(); i--;)
+        DeletePage(i);

 
     return wxNotebookBase::DeleteAllPages();
 }
 
 
     return wxNotebookBase::DeleteAllPages();
 }
 

-bool wxNotebook::DeletePage( size_t page )
-{
-    if ( m_selection == (int)m_pagesData.GetCount() - 1 )
-    {
-        // the index will become invalid after the page is deleted
-        m_selection = -1;
-    }
-
-    // it will call our DoRemovePage() to do the real work
-    return wxNotebookBase::DeletePage(page);
-}
-

 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {

-    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    // We cannot remove the page yet, as GTK sends the "switch_page"
+    // signal before it has removed the notebook-page from its
+    // corresponding list. Thus, if we were to remove the page from
+    // m_pages at this point, the two lists of pages would be out
+    // of sync during the PAGE_CHANGING/PAGE_CHANGED events.
+    wxNotebookPage *client = GetPage(page);

     if ( !client )
         return NULL;
 
     if ( !client )
         return NULL;
 

-    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 );
-
+    // we don't need to unparent the client->m_widget; GTK+ will do
+    // that for us (and will throw a warning if we do it!)

     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     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 );
+    // It's safe to remove the page now.
+    wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete"));
+    wxNotebookBase::DoRemovePage(page);

 
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
 
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);


@@ -581,94 +399,164 @@ bool wxNotebook::InsertPage( size_t position,
                              bool select,
                              int imageId )
 {
                              bool select,
                              int imageId )
 {

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

 
 

-    wxCHECK_MSG( win->GetParent() == this, FALSE,
+    wxCHECK_MSG( win->GetParent() == this, false,

                wxT("Can't add a page whose parent is not the notebook!") );
 
                wxT("Can't add a page whose parent is not the notebook!") );
 

-    wxCHECK_MSG( position <= GetPageCount(), FALSE,
-                 _T("invalid page index in wxNotebookPage::InsertPage()") );
+    wxCHECK_MSG( position <= GetPageCount(), false,
+                 wxT("invalid page index in wxNotebookPage::InsertPage()") );

 
 

-    /* 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 );
+    // Hack Alert! (Part II): See above in wxNotebook::AddChildGTK
+    // why this has to be done.
+    gtk_widget_unparent(win->m_widget);

 
     if (m_themeEnabled)
 
     if (m_themeEnabled)

-        win->SetThemeEnabled(TRUE);
+        win->SetThemeEnabled(true);

 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 

-    wxGtkNotebookPage *nb_page = new wxGtkNotebookPage();
-
-    if ( position == GetPageCount() )
-        m_pagesData.Append( nb_page );
-    else
-        m_pagesData.Insert( m_pagesData.Item( position ), nb_page );
+    wxGtkNotebookPage* pageData = new wxGtkNotebookPage;

 
     m_pages.Insert(win, position);
 
     m_pages.Insert(win, position);

+    m_pagesData.Insert(position, pageData);

 
 

-    nb_page->m_box = gtk_hbox_new( FALSE, 1 );
-    gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 );
+    // set the label image and text
+    // this must be done before adding the page, as GetPageText
+    // and GetPageImage will otherwise return wrong values in
+    // the page-changed event that results from inserting the
+    // first page.
+    pageData->m_imageIndex = imageId;

 
 

-    gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
-      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+    pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+    gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2);

 
 

-#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
+    pageData->m_image = NULL;
+    if (imageId != -1)
+    {
+        if (HasImageList())
+        {
+            const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(imageId);
+            pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+            gtk_box_pack_start(GTK_BOX(pageData->m_box),
+                pageData->m_image, false, false, m_padding);
+        }
+        else
+        {
+            wxFAIL_MSG("invalid notebook imagelist");
+        }
+    }
+
+    /* set the label text */
+    pageData->m_label = gtk_label_new(wxGTK_CONV(wxStripMenuCodes(text)));
+    gtk_box_pack_end(GTK_BOX(pageData->m_box),
+        pageData->m_label, false, false, m_padding);
+
+    gtk_widget_show_all(pageData->m_box);
+    gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position);
+
+    /* apply current style */
+#ifdef __WXGTK3__
+    GTKApplyStyle(pageData->m_label, NULL);
+#else
+    GtkRcStyle *style = GTKCreateWidgetStyle();
+    if ( style )
+    {
+        gtk_widget_modify_style(pageData->m_label, style);
+        g_object_unref(style);
+    }

 #endif
 #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;
+    if (select && GetPageCount() > 1)
+    {
+        SetSelection( position );
+    }

 
 

-    /* set the label image */
-    nb_page->m_image = imageId;
+    InvalidateBestSize();
+    return true;
+}

 
 

-    if (imageId != -1)
-    {
-        wxASSERT( m_imageList != NULL );
+// helper for HitTest(): check if the point lies inside the given widget which
+// is the child of the notebook whose position and border size are passed as
+// parameters
+static bool
+IsPointInsideWidget(const wxPoint& pt, GtkWidget *w,
+                    gint x, gint y, gint border = 0)
+{
+    GtkAllocation a;
+    gtk_widget_get_allocation(w, &a);
+    return
+        (pt.x >= a.x - x - border) &&
+        (pt.x <= a.x - x + border + a.width) &&
+        (pt.y >= a.y - y - border) &&
+        (pt.y <= a.y - y + border + a.height);
+}

 
 

-        const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
-        GdkPixmap *pixmap = bmp->GetPixmap();
-        GdkBitmap *mask = (GdkBitmap*) NULL;
-        if ( bmp->GetMask() )
-        {
-            mask = bmp->GetMask()->GetBitmap();
-        }
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
+{
+    GtkAllocation a;
+    gtk_widget_get_allocation(m_widget, &a);
+    const int x = a.x;
+    const int y = a.y;
+
+    const size_t count = GetPageCount();
+    size_t i = 0;
+
+#ifndef __WXGTK3__
+    GtkNotebook * notebook = GTK_NOTEBOOK(m_widget);
+    if (gtk_notebook_get_scrollable(notebook))
+        i = g_list_position( notebook->children, notebook->first_tab );
+#endif
+
+    for ( ; i < count; i++ )
+    {
+        wxGtkNotebookPage* pageData = GetNotebookPage(i);
+        GtkWidget* box = pageData->m_box;

 
 

-        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));

 
 

-        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
+        if ( IsPointInsideWidget(pt, box, x, y, border) )
+        {
+            // ok, we're inside this tab -- now find out where, if needed
+            if ( flags )
+            {
+                if (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y))
+                {
+                    *flags = wxBK_HITTEST_ONICON;
+                }
+                else if (IsPointInsideWidget(pt, pageData->m_label, x, y))
+                {
+                    *flags = wxBK_HITTEST_ONLABEL;
+                }
+                else
+                {
+                    *flags = wxBK_HITTEST_ONITEM;
+                }
+            }

 
 

-        gtk_widget_show(pixmapwid);
+            return i;
+        }

     }
 
     }
 

-    /* 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)) );
-    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))
+    if ( flags )

     {
     {

-#ifndef __VMS
-   // On VMS position is unsigned and thus always positive
-        if (position < 0)
-            SetSelection( GetPageCount()-1 );
-        else
-#endif
-           SetSelection( position );
+        *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;
+        }

     }
 
     }
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
-      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
-
-    return TRUE;
+    return wxNOT_FOUND;

 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)


@@ -685,34 +573,40 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
     // don't set the sizes of the pages - their correct size is not yet known
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
     // don't set the sizes of the pages - their correct size is not yet known

-    wxControl::SetConstraintSizes(FALSE);
+    wxControl::SetConstraintSizes(false);

 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {

-    return TRUE;
+    return true;

 }
 
 #endif
 
 }
 
 #endif
 

-void wxNotebook::ApplyWidgetStyle()
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    // TODO, font for labels etc
-
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    GTKApplyStyle(m_widget, style);
+    for (size_t i = GetPageCount(); i--;)
+        GTKApplyStyle(GetNotebookPage(i)->m_label, style);

 }
 
 }
 

-bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    return ((m_widget->window == window) ||
-            (NOTEBOOK_PANEL(m_widget) == window));
-}
+    windows.push_back(gtk_widget_get_window(m_widget));
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+#else
+    windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
+#endif

 
 

-//-----------------------------------------------------------------------------
-// wxNotebookEvent
-//-----------------------------------------------------------------------------
+    return NULL;
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new());
+}

 
 #endif
 
 #endif