missing commit

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index b7f8177a6f847e578bc990b6a629c28ecc68974a..5406419a13286baac57c00c6be0911a7714dfc8b 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,39 +7,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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/panel.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 "wx/fontutil.h"
 

-#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/private.h"
+#include "wx/gtk1/win_gtk.h"

 
 #include <gdk/gdkkeysyms.h>
 
 
 #include <gdk/gdkkeysyms.h>
 

-#include "wx/msgdlg.h"
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-

 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------


@@ -70,11 +61,9 @@ public:
     wxGtkNotebookPage()
     {
         m_image = -1;
     wxGtkNotebookPage()
     {
         m_image = -1;

-        m_page = (GtkNotebookPage *) NULL;
-        m_box = (GtkWidget *) NULL;
+        m_page = NULL;
+        m_box = NULL;

     }
     }

-    
-    bool SetFont(const wxFont& font);

 
     wxString           m_text;
     int                m_image;
 
     wxString           m_text;
     int                m_image;


@@ -84,34 +73,15 @@ public:
 };
 
 
 };
 
 

-bool wxGtkNotebookPage::SetFont(const wxFont& font)
-{
-    if (!m_label)
-               return false;
-
-#ifdef __WXGTK20__
-    gtk_widget_modify_font(GTK_WIDGET(m_label),
-                           font.GetNativeFontInfo()->description);
-#else
-    GtkRcStyle *style = gtk_rc_style_new();
-    style->fontset_name = 
-        g_strdup(font.GetNativeFontInfo()->GetXFontName().c_str());
-    gtk_widget_modify_style(GTK_WIDGET(m_label), style);
-    gtk_rc_style_unref(style);
-#endif
-
-       return true;
-}
-
-

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGtkNotebookPagesList);
+WX_DEFINE_LIST(wxGtkNotebookPagesList)

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

+extern "C" {

 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint page,
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint page,


@@ -120,45 +90,52 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
     // are you trying to call SetSelection() from a notebook event handler?
     // you shouldn't!
     wxCHECK_RET( !notebook->m_inSwitchPage,
     // 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") );
+                 wxT("gtk_notebook_page_change_callback reentered") );

 
 

-    notebook->m_inSwitchPage = TRUE;
+    notebook->m_inSwitchPage = true;

     if (g_isIdle)
         wxapp_install_idle_handler();
 
     int old = notebook->GetSelection();
 
     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
+    if (notebook->m_skipNextPageChangeEvent)

     {
     {

+        // this event was programmatically generated by ChangeSelection() and thus must
+        // be skipped
+        notebook->m_skipNextPageChangeEvent = false;
+

         // make wxNotebook::GetSelection() return the correct (i.e. consistent
         // make wxNotebook::GetSelection() return the correct (i.e. consistent

-        // with wxNotebookEvent::GetSelection()) value even though the page is
+        // with wxBookCtrlEvent::GetSelection()) value even though the page is

         // not really changed in GTK+
         // not really changed in GTK+

-        notebook->m_selection = page;
+        notebook->SetSelection(page);
+    }
+    else
+    {
+        if ( !notebook->SendPageChangingEvent(page) )
+        {
+            // 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 wxBookCtrlEvent::GetSelection()) value even though the page is
+            // not really changed in GTK+
+            notebook->SetSelection(page);

 
 

-        wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                                      notebook->GetId(), page, old );
-        eventChanged.SetEventObject( notebook );
-        notebook->GetEventHandler()->ProcessEvent( eventChanged );
+            notebook->SendPageChangedEvent(old);
+        }

     }
 
     notebook->m_inSwitchPage = FALSE;
 }
     }
 
     notebook->m_inSwitchPage = FALSE;
 }

+}

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

+extern "C" {

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle)
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle)


@@ -185,11 +162,13 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
         gtk_widget_size_allocate( win->m_wxwindow, alloc );
     }
 }
         gtk_widget_size_allocate( win->m_wxwindow, alloc );
     }
 }

+}

 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {


@@ -202,38 +181,68 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

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

 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    if (!win->m_hasVMT) return FALSE;
+    if (!notebook->m_hasVMT) return FALSE;

     if (g_blockEventsOnDrag) 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_page( GTK_NOTEBOOK(widget), page );
+
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+

     /* win is a control: tab can be propagated up */
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
     /* 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)
+        int sel = notebook->GetSelection();
+        if (sel == wxNOT_FOUND)

             return TRUE;
             return TRUE;

-        wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel);
-        wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
+        wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
+        wxCHECK_MSG( nb_page, FALSE, wxT("invalid selection in wxNotebook") );

 
         wxNavigationKeyEvent event;
 
         wxNavigationKeyEvent event;

-        event.SetEventObject( win );
+        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 */
         /* 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 );
+        event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ||
+                               (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) );
+        event.SetCurrentFocus( notebook );

 
 

-        wxNotebookPage *client = win->GetPage(sel);
-        if ( !client->GetEventHandler()->ProcessEvent( event ) )
+        wxNotebookPage *client = notebook->GetPage(sel);
+        if ( !client->HandleWindowEvent( event ) )

         {
              client->SetFocus();
         }
         {
              client->SetFocus();
         }


@@ -244,6 +253,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

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


@@ -251,32 +261,35 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
 
 static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 {
 
 static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 {

-    // Hack alert! We manually set the child window
-    // parent field so that GTK can query the 
-    // notebook's style and font. Without that, GetBestSize could return
-    // incorrect size, see bug #901694 for details
+    // 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)
     // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)

-    child->m_widget->parent = parent->m_widget;
+    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, 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_inSwitchPage = false;

 
 

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

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


@@ -301,15 +314,18 @@ 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_needParent = true;
+    m_acceptsFocus = true;

     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     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;

     }
 
 
     }
 
 


@@ -322,11 +338,11 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     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_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
         gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",


@@ -337,14 +353,14 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 

-    return TRUE;
+    return true;

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

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

 
 

-    if ( m_selection == -1 )
+    if ( m_selection == wxNOT_FOUND )

     {
         GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 
     {
         GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 


@@ -355,8 +371,8 @@ int wxNotebook::GetSelection() const
             gpointer cur = notebook->cur_page;
             if ( cur != NULL )
             {
             gpointer cur = notebook->cur_page;
             if ( cur != NULL )
             {

-                wxConstCast(this, wxNotebook)->m_selection =
-                    g_list_index( nb_pages, cur );
+                const_cast<wxNotebook *>(this)->
+                    SetSelection(g_list_index( nb_pages, cur ));

             }
         }
     }
             }
         }
     }


@@ -366,13 +382,13 @@ int wxNotebook::GetSelection() const
 
 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( m_widget != NULL, wxEmptyString, wxT("invalid notebook") );

 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_text;
     else
 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
         return nb_page->m_text;
     else

-        return wxT("");
+        return wxEmptyString;

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


@@ -388,25 +404,36 @@ int wxNotebook::GetPageImage( size_t page ) const
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {

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

 
 

-    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), 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( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );

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

+    if ( !(flags & SetSelection_SendEvent) )
+        m_skipNextPageChangeEvent = true;
+

     // cache the selection
     m_selection = page;
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
     // cache the selection
     m_selection = page;
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 

+    // gtk_notebook_set_current_page is supposed to emit the switch-page signal
+    // which should be caught by our gtk_notebook_page_change_callback which
+    // should have reset the flag to false, check it:
+    wxASSERT_LEVEL_2_MSG(
+        (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
+        "internal error in selection events generation"
+    );
+

     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();
     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();


@@ -426,7 +453,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
 
     gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 
 
     gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )
 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )


@@ -441,7 +468,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 

-    /* if (image == nb_page->m_image) return TRUE; */
+    /* if (image == nb_page->m_image) return true; */

 
     /* For different cases:
        1) no image -> no image
 
     /* For different cases:
        1) no image -> no image


@@ -450,9 +477,9 @@ bool wxNotebook::SetPageImage( size_t page, int image )
        4) image -> image */
 
     if (image == -1 && nb_page->m_image == -1)
        4) image -> image */
 
     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 = NULL;

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


@@ -478,17 +505,17 @@ bool wxNotebook::SetPageImage( size_t page, int image )
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
 
             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 */
         }
     }
 
     /* Only cases 3) and 4) left */

-    wxASSERT( m_imageList != NULL ); /* Just in case */
+    wxASSERT( HasImageList() ); /* Just in case */

 
     /* Construct the new pixmap */
 
     /* Construct the new pixmap */

-    const wxBitmap *bmp = m_imageList->GetBitmap(image);
+    const wxBitmap *bmp = GetImageList()->GetBitmapPtr(image);

     GdkPixmap *pixmap = bmp->GetPixmap();
     GdkPixmap *pixmap = bmp->GetPixmap();

-    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkBitmap *mask = NULL;

     if ( bmp->GetMask() )
     {
         mask = bmp->GetMask()->GetBitmap();
     if ( bmp->GetMask() )
     {
         mask = bmp->GetMask()->GetBitmap();


@@ -511,7 +538,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
 
     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) )


@@ -558,26 +585,20 @@ bool wxNotebook::DeleteAllPages()
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );
 
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );
 

-    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+    wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") );

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

-bool wxNotebook::DeletePage( size_t page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )

 {
 {

-    if ( m_selection >= page )
+    if ( m_selection != wxNOT_FOUND && (size_t)m_selection >= page )

     {
         // the index will become invalid after the page is deleted
     {
         // the index will become invalid after the page is deleted

-        m_selection = -1;
+        m_selection = wxNOT_FOUND;

     }
 
     }
 

-    // it will call our DoRemovePage() to do the real work
-    return wxNotebookBase::DeletePage(page);
-}
-
-wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
-{

     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;


@@ -616,10 +637,13 @@ bool wxNotebook::InsertPage( size_t position,
                wxT("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( position <= GetPageCount(), FALSE,
                wxT("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( position <= GetPageCount(), FALSE,

-                 _T("invalid page index in wxNotebookPage::InsertPage()") );
+                 wxT("invalid page index in wxNotebookPage::InsertPage()") );

 
 

-    // Hack alert part II! See above in InsertChildInNotebook
-    // callback why this has to be done.
+    // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
+    // why this has to be done.  NOTE: using gtk_widget_unparent here does not
+    // work as it seems to undo too much and will cause errors in the
+    // gtk_notebook_insert_page below, so instead just clear the parent by
+    // hand here.

     win->m_widget->parent = NULL;
 
     // don't receive switch page during addition
     win->m_widget->parent = NULL;
 
     // don't receive switch page during addition


@@ -627,7 +651,7 @@ bool wxNotebook::InsertPage( size_t position,
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     if (m_themeEnabled)
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     if (m_themeEnabled)

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

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


@@ -636,7 +660,7 @@ bool wxNotebook::InsertPage( size_t position,
     if ( position == GetPageCount() )
         m_pagesData.Append( nb_page );
     else
     if ( position == GetPageCount() )
         m_pagesData.Append( nb_page );
     else

-        m_pagesData.Insert( m_pagesData.Item( position ), nb_page );
+        m_pagesData.Insert( position, nb_page );

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


@@ -646,13 +670,7 @@ bool wxNotebook::InsertPage( size_t position,
     gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
 
     gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
 

-#ifndef __VMS
-   // On VMS position is unsigned and thus always positive
-   if (position < 0)
-        gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
-    else
-#endif
-     gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
+    gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );

 
     nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 
 
     nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 


@@ -661,11 +679,11 @@ bool wxNotebook::InsertPage( size_t position,
 
     if (imageId != -1)
     {
 
     if (imageId != -1)
     {

-        wxASSERT( m_imageList != NULL );
+        wxASSERT( HasImageList() );

 
 

-        const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+        const wxBitmap *bmp = GetImageList()->GetBitmapPtr(imageId);

         GdkPixmap *pixmap = bmp->GetPixmap();
         GdkPixmap *pixmap = bmp->GetPixmap();

-        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkBitmap *mask = NULL;

         if ( bmp->GetMask() )
         {
             mask = bmp->GetMask()->GetBitmap();
         if ( bmp->GetMask() )
         {
             mask = bmp->GetMask()->GetBitmap();


@@ -681,29 +699,31 @@ bool wxNotebook::InsertPage( size_t position,
     /* set the label text */
 
     nb_page->m_text = text;
     /* set the label text */
 
     nb_page->m_text = text;

-    if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
+    if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;

 
     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 );
 
 
     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))
     {
     /* show the label */
     gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
     if (select && (m_pagesData.GetCount() > 1))
     {

-#ifndef __VMS
-   // On VMS position is unsigned and thus always positive
-        if (position < 0)
-            SetSelection( GetPageCount()-1 );
-        else
-#endif
-           SetSelection( position );
+      SetSelection( position );

     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     InvalidateBestSize();
     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     InvalidateBestSize();

-    return TRUE;
+    return true;

 }
 
 // helper for HitTest(): check if the point lies inside the given widget which
 }
 
 // helper for HitTest(): check if the point lies inside the given widget which


@@ -726,17 +746,23 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     const gint y = m_widget->allocation.y;
 
     const size_t count = GetPageCount();
     const gint y = m_widget->allocation.y;
 
     const size_t count = GetPageCount();

-    for ( size_t i = 0; i < count; i++ )
+    size_t i = 0;
+
+    // MR: Code to fix HitTest index return when tabs are scrolled.
+    // No idea if it would work for GTK1
+#if 0
+    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* nb_page = GetNotebookPage(i);
         GtkWidget *box = nb_page->m_box;
 
         // VZ: don't know how to find the border width in GTK+ 1.2
     {
         wxGtkNotebookPage* nb_page = GetNotebookPage(i);
         GtkWidget *box = nb_page->m_box;
 
         // VZ: don't know how to find the border width in GTK+ 1.2

-#ifdef __WXGTK20__
-        const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
-#else // !GTK+ 2.x

         const gint border = 0;
         const gint border = 0;

-#endif

         if ( IsPointInsideWidget(pt, box, x, y, border) )
         {
             // ok, we're inside this tab -- now find out where, if needed
         if ( IsPointInsideWidget(pt, box, x, y, border) )
         {
             // ok, we're inside this tab -- now find out where, if needed


@@ -759,15 +785,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 
                 if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
                 {
 
                 if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
                 {

-                    *flags = wxNB_HITTEST_ONICON;
+                    *flags = wxBK_HITTEST_ONICON;

                 }
                 else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
                 {
                 }
                 else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
                 {

-                    *flags = wxNB_HITTEST_ONLABEL;
+                    *flags = wxBK_HITTEST_ONLABEL;

                 }
                 else
                 {
                 }
                 else
                 {

-                    *flags = wxNB_HITTEST_ONITEM;
+                    *flags = wxBK_HITTEST_ONITEM;

                 }
             }
 
                 }
             }
 


@@ -776,7 +802,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     }
 
     if ( flags )
     }
 
     if ( flags )

-        *flags = wxNB_HITTEST_NOWHERE;
+        *flags = wxBK_HITTEST_NOWHERE;

 
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }


@@ -800,15 +826,17 @@ void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {

-    return TRUE;
+    return true;

 }
 
 #endif
 
 void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 }
 
 #endif
 
 void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    // TODO, font for labels etc
-    gtk_widget_modify_style( m_widget, 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);

 }
 
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 }
 
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )


@@ -817,19 +845,6 @@ bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 
             (NOTEBOOK_PANEL(m_widget) == window));
 }
 

-bool  wxNotebook::SetFont(const wxFont& font)
-{
-       bool rc=wxNotebookBase::SetFont(font);
-
-       if (rc)
-       {
-               size_t i;
-               for (i=0 ; i < m_pagesData.GetCount() ; i++)
-                       GetNotebookPage(i)->SetFont(font);
-       }
-       return rc;
-}
-

 // static
 wxVisualAttributes
 wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))


@@ -837,10 +852,4 @@ wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
 }
 

-//-----------------------------------------------------------------------------
-// wxNotebookEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
-

 #endif
 #endif