Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 2c275b44340b074da187b0a8db7ba98052b706c2..3626e86c461a04e89256808e17bb46a43c2d6319 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -21,10 +21,10 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/win_gtk.h"

-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdkkeysyms.h>

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


@@ -50,18 +50,18 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------

-// wxNotebookPage
+// wxGtkNotebookPage

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

-class wxNotebookPage: public wxObject
+class wxGtkNotebookPage: public wxObject

 {
 public:
 {
 public:

-  wxNotebookPage()
+  wxGtkNotebookPage()

   {
     m_text = "";
     m_image = -1;
     m_page = (GtkNotebookPage *) NULL;
   {
     m_text = "";
     m_image = -1;
     m_page = (GtkNotebookPage *) NULL;

-    m_client = (wxWindow *) NULL;
+    m_client = (wxNotebookPage *) NULL;

     m_box = (GtkWidget *) NULL;
   }
 
     m_box = (GtkWidget *) NULL;
   }
 


@@ -69,7 +69,7 @@ public:
   int                m_image;
   GtkNotebookPage   *m_page;
   GtkLabel          *m_label;
   int                m_image;
   GtkNotebookPage   *m_page;
   GtkLabel          *m_label;

-  wxWindow          *m_client;
+  wxNotebookPage    *m_client;

   GtkWidget         *m_box;     // in which the label and image are packed
 };
 
   GtkWidget         *m_box;     // in which the label and image are packed
 };
 


@@ -82,7 +82,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               gint page,
                                               wxNotebook *notebook )
 {
                                               gint page,
                                               wxNotebook *notebook )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     int old = notebook->GetSelection();
         wxapp_install_idle_handler();
 
     int old = notebook->GetSelection();


@@ -90,7 +90,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
     wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
                             notebook->GetId(), page, old );
     event1.SetEventObject( notebook );
     wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
                             notebook->GetId(), page, old );
     event1.SetEventObject( notebook );

-    
+

     if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
         !event1.IsAllowed() )
     {
     if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
         !event1.IsAllowed() )
     {


@@ -111,7 +111,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     if ((win->m_x == alloc->x) &&
         wxapp_install_idle_handler();
 
     if ((win->m_x == alloc->x) &&


@@ -121,12 +121,18 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
     {
         return;
     }
     {
         return;
     }

-    
+

     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 

-    if (win->GetAutoLayout())
+    /* 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)))

     {
     {

-        win->Layout();
+        gtk_widget_size_allocate( win->m_wxwindow, alloc );

     }
 }
 
     }
 }
 


@@ -134,20 +140,58 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 // "realize" from m_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 take repositioning before showing to take effect. */
-

 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 

+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
+       here in order to make repositioning before showing to take effect. */

     gtk_widget_queue_resize( win->m_widget );
 
     return FALSE;
 }
 
     gtk_widget_queue_resize( win->m_widget );
 
     return FALSE;
 }
 

+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    /* win is a control: tab can be propagated up */
+    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    {
+        wxNode *node = win->m_pages.Nth( win->GetSelection() );
+        if (!node) return FALSE;
+
+        wxGtkNotebookPage *page = (wxGtkNotebookPage*) node->Data();
+
+        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 );
+        if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
+        {
+             page->m_client->SetFocus();
+        }
+
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+

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


@@ -190,7 +234,7 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 wxNotebook::~wxNotebook()
 {
     /* don't generate change page events any more */
 wxNotebook::~wxNotebook()
 {
     /* don't generate change page events any more */

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), 
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),

       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     DeleteAllPages();
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     DeleteAllPages();


@@ -208,7 +252,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );

-       return FALSE;
+        return FALSE;

     }
 
 
     }
 
 


@@ -225,36 +269,28 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-       if(m_windowStyle & wxNB_RIGHT)
-               gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
-       if(m_windowStyle & wxNB_LEFT)
-               gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
-       if(m_windowStyle & wxNB_BOTTOM)
-               gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
+    if (m_windowStyle & wxNB_RIGHT)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
+    if (m_windowStyle & wxNB_LEFT)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
+    if (m_windowStyle & wxNB_BOTTOM)
+        gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
+      GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );

 
     PostCreation();
 
 
     PostCreation();
 

+    SetFont( parent->GetFont() );
+

     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 );

-                           
+

     Show( TRUE );
 
     return TRUE;
 }
 
     Show( TRUE );
 
     return TRUE;
 }
 

-void wxNotebook::SetFocus()
-{
-    if (m_pages.GetCount() == 0) return;
-
-    wxNode *node = m_pages.Nth( GetSelection() );
-
-    if (!node) return;
-
-    wxNotebookPage *page = (wxNotebookPage*) node->Data();
-
-    page->m_client->SetFocus();
-}
-

 int wxNotebook::GetSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 int wxNotebook::GetSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );


@@ -264,9 +300,9 @@ int wxNotebook::GetSelection() const
     if (g_list_length(pages) == 0) return -1;
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
     if (g_list_length(pages) == 0) return -1;
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);

-    
+

     if (notebook->cur_page == NULL) return m_lastSelection;
     if (notebook->cur_page == NULL) return m_lastSelection;

-    
+

     return g_list_index( pages, (gpointer)(notebook->cur_page) );
 }
 
     return g_list_index( pages, (gpointer)(notebook->cur_page) );
 }
 


@@ -284,7 +320,7 @@ wxString wxNotebook::GetPageText( int page ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
 
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("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


@@ -295,22 +331,22 @@ int wxNotebook::GetPageImage( int page ) const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("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
         return -1;
 }
 
     if (nb_page)
         return nb_page->m_image;
     else
         return -1;
 }
 

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

 {
 {

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

 
 

-    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
-    

     wxNode *node = m_pages.Nth( page );
     wxNode *node = m_pages.Nth( page );

-    
-    return (wxNotebookPage *) node->Data();
+
+    return (wxGtkNotebookPage *) node->Data();

 }
 
 int wxNotebook::SetSelection( int page )
 }
 
 int wxNotebook::SetSelection( int page )


@@ -320,8 +356,12 @@ int wxNotebook::SetSelection( int page )
     wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") );
 
     int selOld = GetSelection();
     wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") );
 
     int selOld = GetSelection();

-    
+

     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );

+    
+    wxGtkNotebookPage* g_page = GetNotebookPage( page );
+    if (g_page->m_client) 
+        g_page->m_client->SetFocus();

 
     return selOld;
 }
 
     return selOld;
 }


@@ -330,13 +370,19 @@ void wxNotebook::AdvanceSelection( bool forward )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
 

-    int sel = GetSelection();

     int max = GetPageCount();
     int max = GetPageCount();

+    if ( !max )
+    {
+        // nothing to do with empty notebook
+        return;
+    }
+
+    int sel = GetSelection();

 
     if (forward)
 
     if (forward)

-        SetSelection( sel == max ? 0 : sel + 1 );
+        SetSelection( sel == max - 1 ? 0 : sel + 1 );

     else
     else

-        SetSelection( sel == 0 ? max-1 : sel - 1 );
+        SetSelection( sel == 0 ? max - 1 : sel - 1 );

 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )


@@ -348,14 +394,14 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 

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

 
     wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
 
     nb_page->m_text = text;
 
     gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );
 
     wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
 
     nb_page->m_text = text;
 
     gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );

-   
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -363,7 +409,7 @@ bool wxNotebook::SetPageImage( int 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);
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);

 
     if (!nb_page) return FALSE;
 
 
     if (!nb_page) return FALSE;
 


@@ -390,20 +436,20 @@ bool wxNotebook::SetPageImage( int page, int image )
 
         GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
         while (child)
 
         GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
         while (child)

-       {
+        {

             if (GTK_IS_PIXMAP(child->data))
             if (GTK_IS_PIXMAP(child->data))

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

             }
             }

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

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

-       {
+        {

             /* If there's no new widget, just remove the old from the box */
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
             /* 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;


@@ -471,16 +517,16 @@ bool wxNotebook::DeleteAllPages()
 
 bool wxNotebook::DeletePage( int page )
 {
 
 bool wxNotebook::DeletePage( int page )
 {

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

     if (!nb_page) return FALSE;
 
     /* GTK sets GtkNotebook.cur_page to NULL before sending
     if (!nb_page) return FALSE;
 
     /* GTK sets GtkNotebook.cur_page to NULL before sending

-       the switvh page event */
+       the switch page event */

     m_lastSelection = GetSelection();
     m_lastSelection = GetSelection();

-    
+

     nb_page->m_client->Destroy();
     m_pages.DeleteObject( nb_page );
     nb_page->m_client->Destroy();
     m_pages.DeleteObject( nb_page );

-    
+

     m_lastSelection = -1;
 
     return TRUE;
     m_lastSelection = -1;
 
     return TRUE;


@@ -488,10 +534,14 @@ bool wxNotebook::DeletePage( int page )
 
 bool wxNotebook::RemovePage( int page )
 {
 
 bool wxNotebook::RemovePage( int page )
 {

-    wxNotebookPage* nb_page = GetNotebookPage(page);
-    
-    if (!nb_page) return FALSE;
+    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+
+    wxCHECK_MSG( nb_page, FALSE, _T("wxNotebook::RemovePage: invalid page") );

 
 

+    gtk_widget_ref( nb_page->m_client->m_widget );
+    gtk_widget_unrealize( nb_page->m_client->m_widget );
+    gtk_widget_unparent( nb_page->m_client->m_widget );
+        

     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     m_pages.DeleteObject( nb_page );
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     m_pages.DeleteObject( nb_page );


@@ -499,7 +549,7 @@ bool wxNotebook::RemovePage( int page )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
+bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text,

                              bool select, int imageId )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
                              bool select, int imageId )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );


@@ -507,19 +557,19 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
     wxCHECK_MSG( win->GetParent() == this, FALSE,
                wxT("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( win->GetParent() == this, FALSE,
                wxT("Can't add a page whose parent is not the notebook!") );
 

-    /* don't receive switch page during addition */           
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), 
+    /* 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 );
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );

-      
+

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

-    wxNotebookPage *page = new wxNotebookPage();
-    
+    wxGtkNotebookPage *page = new wxGtkNotebookPage();
+

     if (position < 0)
         m_pages.Append( page );
     else
         m_pages.Insert( m_pages.Nth( position ), page );
     if (position < 0)
         m_pages.Append( page );
     else
         m_pages.Insert( m_pages.Nth( position ), page );

-    
+

     page->m_client = win;
 
     page->m_box = gtk_hbox_new( FALSE, 0 );
     page->m_client = win;
 
     page->m_box = gtk_hbox_new( FALSE, 0 );


@@ -530,14 +580,14 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
 
     if (position < 0)
         gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
 
     if (position < 0)
         gtk_notebook_append_page( notebook, win->m_widget, page->m_box );

-    else 
+    else

         gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position );
 
     page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 
     /* set the label image */
     page->m_image = imageId;
         gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position );
 
     page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
 
     /* set the label image */
     page->m_image = imageId;

-    
+

     if (imageId != -1)
     {
         wxASSERT( m_imageList != NULL );
     if (imageId != -1)
     {
         wxASSERT( m_imageList != NULL );


@@ -560,7 +610,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
     /* set the label text */
     page->m_text = text;
     if (page->m_text.IsEmpty()) page->m_text = wxT("");
     /* set the label text */
     page->m_text = text;
     if (page->m_text.IsEmpty()) page->m_text = wxT("");

-    
+

     page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) );
     gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 );
 
     page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) );
     gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 );
 


@@ -571,7 +621,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
     {
         if (position < 0)
             SetSelection( GetPageCount()-1 );
     {
         if (position < 0)
             SetSelection( GetPageCount()-1 );

-       else
+        else

             SetSelection( position );
     }
 
             SetSelection( position );
     }
 


@@ -581,7 +631,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text,

                          bool select, int imageId)
 {
     return InsertPage( -1, win, text, select, imageId );
                          bool select, int imageId)
 {
     return InsertPage( -1, win, text, select, imageId );


@@ -595,17 +645,19 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         event.Skip();
 }
 
         event.Skip();
 }
 

-wxWindow *wxNotebook::GetPage( int page ) const
+wxNotebookPage *wxNotebook::GetPage( int page ) const

 {
     wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
 
 {
     wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
 

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

     if (!nb_page)
     if (!nb_page)

-        return (wxWindow *) NULL;
+        return (wxNotebookPage *) NULL;

     else
         return nb_page->m_client;
 }
 
     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) )
 {
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {


@@ -618,8 +670,12 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif
+

 void wxNotebook::ApplyWidgetStyle()
 {
 void wxNotebook::ApplyWidgetStyle()
 {

+    // TODO, font for labels etc
+

     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }