Image size fix

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 96be1af67e42dc33a13da66883129ca6753b0f6f..448d7e46384836df1ec1d85788c40daafa05af9b 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,101 +7,115 @@
 // 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/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"
+
+#include "wx/gtk/private.h"

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdkkeysyms.h>
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)

 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;

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

-// wxNotebookPage
+// wxGtkNotebookPage

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

-class wxNotebookPage: public wxObject
+// VZ: this is rather ugly as we keep the pages themselves in an array (it
+//     allows us to have quite a few functions implemented in the base class)
+//     but the page data is kept in a separate list, so we must maintain them
+//     in sync manually... of course, the list had been there before the base
+//     class which explains it but it still would be nice to do something
+//     about this one day
+
+class wxGtkNotebookPage: public wxObject

 {
 public:
 {
 public:

-  wxNotebookPage()
-  {
-    m_id = -1;
-    m_text = "";
-    m_image = -1;
-    m_page = (GtkNotebookPage *) NULL;
-    m_client = (wxWindow *) NULL;
-    m_parent = (GtkNotebook *) NULL;
-    m_box = (GtkWidget *) NULL;
-    m_added = FALSE;
-  }
-
-  /*
-     mark page as "added' to the notebook, return FALSE if the page was
-     already added
-   */ 
-   
-  bool Add()
-  {
-    if ( WasAdded() )
-      return FALSE;
-
-    m_added = TRUE;
-    return TRUE;
-  }
-
-  bool WasAdded() const { return m_added; }
-
-  int                m_id;
-  wxString           m_text;
-  int                m_image;
-  GtkNotebookPage   *m_page;
-  GtkLabel          *m_label;
-  wxWindow          *m_client;
-  GtkNotebook       *m_parent;
-  GtkWidget         *m_box;     // in which the label and image are packed
-
-private:
-  bool m_added;
+    wxGtkNotebookPage()
+    {
+        m_image = -1;
+        m_page = (GtkNotebookPage *) NULL;
+        m_box = (GtkWidget *) NULL;
+    }
+
+    wxString           m_text;
+    int                m_image;
+    GtkNotebookPage   *m_page;
+    GtkLabel          *m_label;
+    GtkWidget         *m_box;     // in which the label and image are packed

 };
 
 };
 

+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGtkNotebookPagesList)
+
+

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 

-static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
-                                              GtkNotebookPage *WXUNUSED(page),
-                                              gint nPage,
-                                              gpointer data)
+extern "C" {
+static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
+                                                 GtkNotebookPage *WXUNUSED(gpage),
+                                                 guint page,
+                                                 wxNotebook *notebook )

 {
 {

-    wxNotebook *notebook = (wxNotebook *)data;
+    int old = gtk_notebook_get_current_page( widget );

 
 

-    int old = notebook->GetSelection();
-
-    // TODO: emulate PAGE_CHANGING event
+    if ( !notebook->SendPageChangingEvent(page) )
+    {
+        // program doesn't allow the page change
+        g_signal_stop_emission_by_name(notebook->m_widget, "switch_page");
+    }
+    else
+    {
+        // the page change event also reports the old page
+        notebook->m_oldSelection = old;
+    }
+}
+}

 
 

-    wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                           notebook->GetId(),  nPage, old );
-    event.SetEventObject( notebook );
-    notebook->GetEventHandler()->ProcessEvent( event );
+extern "C" {
+static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget),
+                                                GtkNotebookPage *WXUNUSED(gpage),
+                                                guint WXUNUSED(page),
+                                                wxNotebook *notebook )
+{
+    int old = notebook->m_oldSelection;
+    notebook->SendPageChangedEvent( old );
+}

 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if ((win->m_x == alloc->x) &&
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if ((win->m_x == alloc->x) &&


@@ -113,90 +127,61 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
     }
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
     }
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );

-  
-    if (win->GetAutoLayout()) win->Layout();
+}

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

-// "key_press_event"
+// "realize" from m_widget

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

-static gint 
-gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook )
+extern "C" {
+static void
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )

 {
 {

-    if (g_blockEventsOnDrag) return FALSE;
-
-    if (!notebook->HasVMT()) return FALSE;
-    
-    /* this code makes jumping down from the handles of the notebooks
-       to the actual items in the visible notebook page possible with
-       the down-arrow key */
-
-    if (gdk_event->keyval != GDK_Down) return FALSE;
-    
-    if (notebook != notebook->FindFocus()) return FALSE;
-    
-    if (notebook->m_pages.GetCount() == 0) return FALSE;
-    
-    wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() );
-    
-    if (!node) return FALSE;
-    
-    wxNotebookPage *page = (wxNotebookPage*) node->Data();
-    
-    // don't let others the key event
-    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
-    
-    page->m_client->SetFocus();
-    
-    return TRUE;
+    /* 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 );
+}

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

-static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
-{
-    wxNotebookPage *page = new wxNotebookPage();
-
-    page->m_id = parent->GetPageCount();
-
-    page->m_box = gtk_hbox_new (FALSE, 0);
-    gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
-
-    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-
-    page->m_client = child;
-    gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
-
-    page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-
-    page->m_parent = notebook;
-
-    gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
-      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-
-    wxASSERT_MSG( page->m_page, "Notebook page creation error" );
-
-    parent->m_pages.Append( page );
+static void wxInsertChildInNotebook(wxWindow* 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)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase)

 
 

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

     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()

-    
+

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

+    m_padding = 0;
+

     m_imageList = (wxImageList *) NULL;
     m_imageList = (wxImageList *) NULL;

-    m_pages.DeleteContents( TRUE );
-    m_idHandler = 0;
+    m_oldSelection = -1;
+    m_themeEnabled = true;

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


@@ -214,459 +199,524 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 
 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);
-

     DeleteAllPages();
 }
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     DeleteAllPages();
 }
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,

-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name )

 {
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+    m_insertCallback = wxInsertChildInNotebook;

 
 

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

 
 

-    m_widget = gtk_notebook_new();
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+        return false;
+    }

 
 

-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, "wxNotebook::m_widget", name );
-#endif
+
+    m_widget = gtk_notebook_new();

 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 

-    m_idHandler = gtk_signal_connect (
-                  GTK_OBJECT(m_widget), "switch_page",
-                  GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
-                  (gpointer)this );
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_changing_callback), this);

 
 

-    m_parent->AddChild( this );
+    g_signal_connect_after (m_widget, "switch_page",
+                      G_CALLBACK (gtk_notebook_page_changed_callback), this);

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
-      GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );
+    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 );

 
 

-    PostCreation();
+    PostCreation(size);

 
 

-    Show( TRUE );
+    g_signal_connect (m_widget, "realize",
+                      G_CALLBACK (gtk_notebook_realized_callback), this);

 
 

-    return TRUE;
+    return true;

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

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

 
 

-    if (m_pages.Number() == 0) return -1;
-
-    GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-    if (!g_page) return -1;
-
-    wxNotebookPage *page = (wxNotebookPage *) NULL;
-
-    wxNode *node = m_pages.First();
-    while (node)
-    {
-        page = (wxNotebookPage*)node->Data();
-
-        if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL))
-        {
-            // page->m_page is NULL directly after gtk_notebook_append. gtk emits
-            // "switch_page" then and we ask for GetSelection() in the handler for
-            // "switch_page". otherwise m_page should never be NULL. all this
-            // might also be wrong.
-            break;
-        }
-        node = node->Next();
-    }
-
-    wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
-
-    return page->m_id;
+    return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );

 }
 
 }
 

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

 {
 {

-    // count only the pages which were already added to the notebook for MSW
-    // compatibility (and, in fact, this behaviour makes more sense anyhow
-    // because only the added pages are shown)
-    
-    int n = 0;
-    for ( wxNode *node = m_pages.First(); node; node = node->Next() )
-    {
-        wxNotebookPage *page = (wxNotebookPage*)node->Data();
-       
-        if (page->WasAdded()) n++;
-    }
-
-    return n;
-}
-
-int wxNotebook::GetRowCount() const
-{
-    return 1;
-}
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") );

 
 

-wxString wxNotebook::GetPageText( int page ) const
-{
-    wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);

     if (nb_page)
         return nb_page->m_text;
     else
     if (nb_page)
         return nb_page->m_text;
     else

-        return "";
+        return wxEmptyString;

 }
 
 }
 

-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );

 
 

-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);

     if (nb_page)
         return nb_page->m_image;
     else
     if (nb_page)
         return nb_page->m_image;
     else

-        return 0;
+        return -1;

 }
 
 }
 

-wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
-
-    wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
-
-    wxNode *node = m_pages.First();
-    while (node)
-    {
-        nb_page = (wxNotebookPage*)node->Data();
-        if (nb_page->m_id == page)
-            return nb_page;
-        node = node->Next();
-    }
+    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );

 
 

-    wxFAIL_MSG( "Notebook page not found!" );
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );

 
 

-    return (wxNotebookPage *) NULL;
+    return m_pagesData.Item(page)->GetData();

 }
 
 }
 

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

 {
 {

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

 
 

-    int selOld = GetSelection();
-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );

 
 

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

 
 

-    int page_num = 0;
-    GList *child = GTK_NOTEBOOK(m_widget)->children;
-    while (child)
+    if ( !(flags & SetSelection_SendEvent) )

     {
     {

-        if (nb_page->m_page == (GtkNotebookPage*)child->data)  break;
-        page_num++;
-        child = child->next;
-    }
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_notebook_page_changing_callback, this);

 
 

-    if (!child) return -1;
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_notebook_page_changed_callback, this);
+    }

 
 

-    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+    gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );

 
 

-    return selOld;
-}
-
-void wxNotebook::AdvanceSelection( bool bForward )
-{
-    wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_notebook_page_changing_callback, this);

 
 

-    int sel = GetSelection();
-    int max = GetPageCount();
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_notebook_page_changed_callback, this);
+    }

 
 

-    if (bForward)
-        SetSelection( sel == max ? 0 : sel + 1 );
-    else
-        SetSelection( sel == 0 ? max-1 : sel - 1 );
-}
+    wxNotebookPage *client = GetPage(page);
+    if ( client )
+        client->SetFocus();

 
 

-void wxNotebook::SetImageList( wxImageList* imageList )
-{
-    m_imageList = imageList;
+    return selOld;

 }
 
 }
 

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

 {
 {

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

 
 

-    wxNotebookPage* nb_page = GetNotebookPage(page);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);

 
 

-    if (!nb_page) return FALSE;
+    wxCHECK_MSG( nb_page, false, wxT("SetPageText: invalid page index") );

 
     nb_page->m_text = text;
 
 
     nb_page->m_text = text;
 

-    if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
- 
-    gtk_label_set(nb_page->m_label, nb_page->m_text);
-   
-    return TRUE;
+    gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
+
+    return true;

 }
 
 }
 

-bool wxNotebook::SetPageImage( int page, int image )
+bool wxNotebook::SetPageImage( size_t page, int image )

 {
     /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
 {
     /* HvdH 28-12-98: now it works, but it's a bit of a kludge */

-    
-    wxNotebookPage* nb_page = GetNotebookPage(page);

 
 

-    if (!nb_page) return FALSE;
- 
+    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 */
     /* 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: 
+
+    /* 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 */
        1) no image -> no image
        2) image -> no image
        3) no image -> image
        4) image -> image */

-       
+

     if (image == -1 && nb_page->m_image == -1)
     if (image == -1 && nb_page->m_image == -1)

-        return TRUE; /* Case 1): Nothing to do. */
- 
+        return true; /* Case 1): Nothing to do. */
+

     GtkWidget *pixmapwid = (GtkWidget*) NULL;
     GtkWidget *pixmapwid = (GtkWidget*) NULL;

- 
-    if (nb_page->m_image != -1) 
+
+    if (nb_page->m_image != -1)

     {
         /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */
     {
         /* 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));
+
+        GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box));

         while (child)
         while (child)

-       {
-            if (GTK_IS_PIXMAP(child->data)) 
-           {
-               pixmapwid = GTK_WIDGET(child->data);
-               break;
+        {
+            if (GTK_IS_IMAGE(child->data))
+            {
+                pixmapwid = GTK_WIDGET(child->data);
+                break;

             }
             }

-           child = child->next;
-       }
-       
+            child = child->next;
+        }
+

         /* We should have the pixmap widget now */
         /* We should have the pixmap widget now */

-        wxASSERT(pixmapwid != NULL); 
-       
-        if (image == -1) 
-       {
+        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;
 
             /* 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) */
+            return true; /* Case 2) */

         }
     }
         }
     }

-   
+

     /* Only cases 3) and 4) left */
     wxASSERT( m_imageList != NULL ); /* Just in case */
     /* Only cases 3) and 4) left */
     wxASSERT( m_imageList != NULL ); /* Just in case */

-   
+

     /* Construct the new pixmap */
     /* 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) 
+    const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
+
+    if (pixmapwid == NULL)

     {
         /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
     {
         /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */

-        pixmapwid = gtk_pixmap_new (pixmap, mask );
-       
+        pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());
+

         /* CHECKME: Are these pack flags okay? */
         /* CHECKME: Are these pack flags okay? */

-        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);

         gtk_widget_show(pixmapwid);
     }
         gtk_widget_show(pixmapwid);
     }

-    else 
+    else

     {
         /* Case 4) Simply replace the pixmap */
     {
         /* Case 4) Simply replace the pixmap */

-        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+        gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf());

     }
     }

-    
+

     nb_page->m_image = image;
 
     nb_page->m_image = image;
 

-    return TRUE;
+    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") );

 
 

-bool wxNotebook::DeleteAllPages()
-{
-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    m_padding = padding.GetWidth();

 
 

-    wxNode *page_node = m_pages.First();
-    while (page_node)
+    int i;
+    for (i=0; i<int(GetPageCount()); i++)

     {
     {

-        wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+        wxASSERT(nb_page != NULL);

 
 

-        DeletePage( page->m_id );
-
-        page_node = m_pages.First();
+        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);

     }
     }

+}

 
 

-    return TRUE;
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
+{
+    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );

 }
 
 }
 

-bool wxNotebook::DeletePage( int page )
+bool wxNotebook::DeleteAllPages()

 {
 {

-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page) return FALSE;
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-    int page_num = 0;
-    GList *child = GTK_NOTEBOOK(m_widget)->children;
-    while (child)
-    {
-        if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
-        page_num++;
-        child = child->next;
-    }
+    while (m_pagesData.GetCount() > 0)
+        DeletePage( m_pagesData.GetCount()-1 );
+
+    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+
+    InvalidateBestSize();
+    return wxNotebookBase::DeleteAllPages();
+}
+
+wxNotebookPage *wxNotebook::DoRemovePage( size_t 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;

 
 

-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    gtk_widget_ref( client->m_widget );
+    gtk_widget_unrealize( client->m_widget );

 
 

-    delete nb_page->m_client;
+    // 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 );

 
 

-    m_pages.DeleteObject( nb_page );
+    // It's safe to remove the page now.
+    wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete"));
+    wxNotebookBase::DoRemovePage(page);

 
 

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

 }
 
 }
 

-bool wxNotebook::RemovePage( int page )
+bool wxNotebook::InsertPage( size_t position,
+                             wxNotebookPage* win,
+                             const wxString& text,
+                             bool select,
+                             int imageId )

 {
 {

-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page) return FALSE;
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-    int page_num = 0;
-    GList *child = GTK_NOTEBOOK(m_widget)->children;
-    while (child)
-    {
-        if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
-        page_num++;
-        child = child->next;
-    }
+    wxCHECK_MSG( win->GetParent() == this, false,
+               wxT("Can't add a page whose parent is not the notebook!") );

 
 

-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    wxCHECK_MSG( position <= GetPageCount(), false,
+                 _T("invalid page index in wxNotebookPage::InsertPage()") );

 
 

-    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+    // 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;

 
 

-    m_pages.DeleteObject( nb_page );
+    if (m_themeEnabled)
+        win->SetThemeEnabled(true);

 
 

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

 
 

-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool select, int imageId)
-{
-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxGtkNotebookPage *nb_page = new wxGtkNotebookPage();

 
 

-    /* we've created the notebook page in AddChild(). Now we just have to set
-       the caption for the page and set the others parameters. */
+    if ( position == GetPageCount() )
+        m_pagesData.Append( nb_page );
+    else
+        m_pagesData.Insert( position, nb_page );

 
 

-    wxNotebookPage *page = (wxNotebookPage *) NULL;
+    m_pages.Insert(win, position);

 
 

-    wxNode *node = m_pages.First();
-    while (node)
-    {
-        page = (wxNotebookPage*)node->Data();
-        if ( page->m_client == win ) break;
-        node = node->Next();
-    }
+    // 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.
+    nb_page->m_image = imageId;
+    nb_page->m_text = wxStripMenuCodes(text);

 
 

-    wxCHECK_MSG( page != NULL, FALSE,
-               "Can't add a page whose parent is not the notebook!" );
+    nb_page->m_box = gtk_hbox_new( FALSE, 1 );
+    gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2);

 
 

-    wxCHECK_MSG( page->Add(), FALSE,
-               "Can't add the same page twice to a notebook." );
+    g_signal_connect (win->m_widget, "size_allocate",
+                      G_CALLBACK (gtk_page_size_callback), win);
+
+    gint idx = gtk_notebook_insert_page(notebook, win->m_widget,
+                                        nb_page->m_box, position);
+
+    nb_page->m_page = (GtkNotebookPage *)gtk_notebook_get_nth_page(notebook, idx);

 
     if (imageId != -1)
     {
         wxASSERT( m_imageList != NULL );
 
 
     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();
-        }
+        const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
+        GtkWidget* pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
+        gtk_widget_show(pixmapwid);
+    }

 
 

-        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+    /* set the label text */
+    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 );

 
 

-        gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+    /* apply current style */
+    GtkRcStyle *style = CreateWidgetStyle();
+    if ( style )
+    {
+        gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style);
+        gtk_rc_style_unref(style);
+    }

 
 

-        gtk_widget_show(pixmapwid);
+    /* show the label */
+    gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
+
+    if (select && (m_pagesData.GetCount() > 1))
+    {
+        SetSelection( position );

     }
 
     }
 

-    /* then set the attributes */
-    page->m_text = text;
-    if (page->m_text.IsEmpty()) page->m_text = "";
-    page->m_image = imageId;
-    page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
-    gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+    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)
+{
+    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();
+    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 );

 
 

-    /* @@@: what does this do? do we still need it?
-    gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
+    for ( ; i < count; i++ )
+    {
+        wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+        GtkWidget *box = nb_page->m_box;

 
 

-    gtk_widget_show((GtkWidget *)page->m_label);
+        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));

 
 

-    if (select) SetSelection( GetPageCount()-1 );
+        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_IMAGE(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 TRUE;
+            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;

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

-    if (event.IsWindowChange()) 
+    if (event.IsWindowChange())

         AdvanceSelection( event.GetDirection() );
         AdvanceSelection( event.GetDirection() );

-    else 
+    else

         event.Skip();
 }
 
         event.Skip();
 }
 

-wxWindow *wxNotebook::GetPage( int page ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
-
-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    if (!nb_page)
-        return (wxWindow *) NULL;
-    else
-        return nb_page->m_client;
-}
+#if wxUSE_CONSTRAINTS

 
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
     // don't set the sizes of the pages - their correct size is not yet known
 
 // 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);
+    wxControl::SetConstraintSizes(false);

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    size_t cnt = m_pagesData.GetCount();
+    for (size_t i = 0; i < cnt; i++)
+        gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style);
+}
+
+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);

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


@@ -675,3 +725,4 @@ void wxNotebook::ApplyWidgetStyle()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 

+#endif