X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/435fe83e747aba481a255bab37768038cf9a9e81..c8b4eea8f23cd90e8b8390f2a742f0f828c57461:/src/gtk1/notebook.cpp

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index ca9146b045..ead3936605 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -12,12 +12,43 @@
 #endif
 
 #include "wx/notebook.h"
+
+#if wxUSE_NOTEBOOK
+
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include "wx/gtk/win_gtk.h"
+#include <gdk/gdkkeysyms.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// debug
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+
+#endif
+
 //-----------------------------------------------------------------------------
 // wxNotebookPage
 //-----------------------------------------------------------------------------
@@ -27,40 +58,19 @@ class wxNotebookPage: public wxObject
 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;
 };
 
 //-----------------------------------------------------------------------------
@@ -69,19 +79,30 @@ private:
 
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
-                                              gint nPage,
-                                              gpointer data)
+                                              gint page,
+                                              wxNotebook *notebook )
 {
-  wxNotebook *notebook = (wxNotebook *)data;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-  int old = notebook->GetSelection();
+    int old = notebook->GetSelection();
 
-  // TODO: emulate PAGE_CHANGING event
+    wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+                            notebook->GetId(), page, old );
+    event1.SetEventObject( notebook );
 
-  wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                         notebook->GetId(),  nPage, old );
-  event.SetEventObject( notebook );
-  notebook->GetEventHandler()->ProcessEvent( event );
+    if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
+        !event1.IsAllowed() )
+    {
+        /* program doesn't allow the page change */
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), "switch_page" );
+        return;
+    }
+
+    wxNotebookEvent event2( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+                            notebook->GetId(), page, old );
+    event2.SetEventObject( notebook );
+    notebook->GetEventHandler()->ProcessEvent( event2 );
 }
 
 //-----------------------------------------------------------------------------
@@ -90,51 +111,55 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
-  if ((win->m_x == alloc->x) &&
-      (win->m_y == alloc->y) &&
-      (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height))
-  {
-    return;
-  }
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if ((win->m_x == alloc->x) &&
+        (win->m_y == alloc->y) &&
+        (win->m_width == alloc->width) &&
+        (win->m_height == alloc->height))
+    {
+        return;
+    }
+
+    win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
-  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-  
-  if (win->GetAutoLayout()) win->Layout();
+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate
+       here in order to make repositioning after resizing to take effect. */
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+	(gtk_micro_version < 6) &&
+        (win->m_wxwindow) && 
+	(GTK_WIDGET_REALIZED(win->m_wxwindow)))
+    {
+        gtk_widget_size_allocate( win->m_wxwindow, alloc );
+    }
 }
 
 //-----------------------------------------------------------------------------
-// InsertChild callback for wxNotebook
+// "realize" from m_widget
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+static gint
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
-  wxNotebookPage *page = new wxNotebookPage();
-
-  page->m_id = parent->GetPageCount();
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-  page->m_box = gtk_hbox_new (FALSE, 0);
-  gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
+    /* 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 );
 
-  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 );
+    return FALSE;
+}
 
-  if (!page->m_page)
-  {
-     wxLogFatalError( "Notebook page creation error" );
-     return;
-  }
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------
 
-  parent->m_pages.Append( page );
+static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+{
+    /* we don't do anything here but pray */
 }
 
 //-----------------------------------------------------------------------------
@@ -143,386 +168,471 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+END_EVENT_TABLE()
+
 void wxNotebook::Init()
 {
-  m_imageList = (wxImageList *) NULL;
-  m_pages.DeleteContents( TRUE );
-  m_idHandler = 0;
+    m_imageList = (wxImageList *) NULL;
+    m_pages.DeleteContents( TRUE );
+    m_lastSelection = -1;
 }
 
 wxNotebook::wxNotebook()
 {
-  Init();
+    Init();
 }
 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
-  Init();
-  Create( parent, id, pos, size, style, name );
+    Init();
+    Create( parent, id, pos, size, style, name );
 }
 
 wxNotebook::~wxNotebook()
 {
-  // don't generate change page events any more
-  if (m_idHandler != 0)
-    gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
+    /* don't generate change page events any more */
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
-  DeleteAllPages();
+    DeleteAllPages();
 }
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
-  m_needParent = TRUE;
-  m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
-  PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+	return FALSE;
+    }
 
-  m_widget = gtk_notebook_new();
 
-  gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
+    m_widget = gtk_notebook_new();
 
-  m_idHandler = gtk_signal_connect (
-                  GTK_OBJECT(m_widget), "switch_page",
-                  GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
-                  (gpointer)this );
+#ifdef __WXDEBUG__
+    debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name );
+#endif
 
-  m_parent->AddChild( this );
+    gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
-  (m_parent->m_insertCallback)( m_parent, this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-  PostCreation();
+    m_parent->DoAddChild( this );
 
-  Show( TRUE );
+	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 );
 
-  return TRUE;
+    PostCreation();
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
+                            GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
+
+    Show( TRUE );
+
+    return TRUE;
 }
 
-int wxNotebook::GetSelection() const
+void wxNotebook::SetFocus()
 {
-  wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+    if (m_pages.GetCount() == 0) return;
 
-  if (m_pages.Number() == 0) return -1;
+    wxNode *node = m_pages.Nth( GetSelection() );
 
-  GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-  if (!g_page) return -1;
+    if (!node) return;
 
-  wxNotebookPage *page = (wxNotebookPage *) NULL;
+    wxNotebookPage *page = (wxNotebookPage*) node->Data();
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
+    page->m_client->SetFocus();
+}
 
-    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();
-  }
+int wxNotebook::GetSelection() const
+{
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+
+    GList *pages = GTK_NOTEBOOK(m_widget)->children;
 
-  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
+    if (g_list_length(pages) == 0) return -1;
 
-  return page->m_id;
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+
+    if (notebook->cur_page == NULL) return m_lastSelection;
+
+    return g_list_index( pages, (gpointer)(notebook->cur_page) );
 }
 
 int wxNotebook::GetPageCount() 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;
+    return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
 }
 
 int wxNotebook::GetRowCount() const
 {
-  return 1;
+    return 1;
 }
 
 wxString wxNotebook::GetPageText( int page ) const
 {
-  wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
 
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_text;
-  else
-    return "";
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_text;
+    else
+        return wxT("");
 }
 
 int wxNotebook::GetPageImage( int page ) const
 {
-  wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_image;
-  else
-    return 0;
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_image;
+    else
+        return -1;
 }
 
-wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
+wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
-  wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") );
 
-  wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
+    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page)
-      return nb_page;
-    node = node->Next();
-  }
+    wxNode *node = m_pages.Nth( page );
 
-  wxLogDebug( "Notebook page %d not found!", page );
-
-  return (wxNotebookPage *) NULL;
+    return (wxNotebookPage *) node->Data();
 }
 
 int wxNotebook::SetSelection( int page )
 {
-  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 < (int)m_pages.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 (nb_page->m_page == (GtkNotebookPage*)child->data)  break;
-    page_num++;
-    child = child->next;
-  }
-
-  if (!child) return -1;
-
-  gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
-  return selOld;
+    return selOld;
 }
 
-void wxNotebook::AdvanceSelection( bool bForward )
+void wxNotebook::AdvanceSelection( bool forward )
 {
-  wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
 
-  int sel = GetSelection();
-  int max = GetPageCount();
+    int sel = GetSelection();
+    int max = GetPageCount();
 
-  if (bForward)
-    SetSelection( sel == max ? 0 : sel + 1 );
-  else
-    SetSelection( sel == 0 ? max : sel - 1 );
+    if (forward)
+        SetSelection( sel == max ? 0 : sel + 1 );
+    else
+        SetSelection( sel == 0 ? max-1 : sel - 1 );
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
-  m_imageList = imageList;
+    m_imageList = imageList;
 }
 
 bool wxNotebook::SetPageText( int 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);
+    wxNotebookPage* 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;
 
-  return TRUE;
+    gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );
+
+    return TRUE;
 }
 
 bool wxNotebook::SetPageImage( int page, int image )
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
+    /* 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;
+
+    /* Optimization posibility: return immediately if image unchanged.
+     * Not enabled because it may break existing (stupid) code that
+     * manipulates the imagelist to cycle images */
+
+    /* if (image == nb_page->m_image) return TRUE; */
+
+    /* For different cases:
+       1) no image -> no image
+       2) image -> no image
+       3) no image -> image
+       4) image -> image */
 
-  if (!nb_page) return FALSE;
+    if (image == -1 && nb_page->m_image == -1)
+        return TRUE; /* Case 1): Nothing to do. */
 
-  nb_page->m_image = image;
+    GtkWidget *pixmapwid = (GtkWidget*) NULL;
 
-  return TRUE;
+    if (nb_page->m_image != -1)
+    {
+        /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */
+
+        GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
+        while (child)
+	{
+            if (GTK_IS_PIXMAP(child->data))
+	    {
+ 	        pixmapwid = GTK_WIDGET(child->data);
+ 	        break;
+            }
+	    child = child->next;
+	}
+
+        /* We should have the pixmap widget now */
+        wxASSERT(pixmapwid != NULL);
+
+        if (image == -1)
+	{
+            /* If there's no new widget, just remove the old from the box */
+            gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
+            nb_page->m_image = -1;
+
+            return TRUE; /* Case 2) */
+        }
+    }
+
+    /* Only cases 3) and 4) left */
+    wxASSERT( m_imageList != NULL ); /* Just in case */
+
+    /* Construct the new pixmap */
+    const wxBitmap *bmp = m_imageList->GetBitmap(image);
+    GdkPixmap *pixmap = bmp->GetPixmap();
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    if ( bmp->GetMask() )
+    {
+        mask = bmp->GetMask()->GetBitmap();
+    }
+
+    if (pixmapwid == NULL)
+    {
+        /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
+        pixmapwid = gtk_pixmap_new (pixmap, mask );
+
+        /* CHECKME: Are these pack flags okay? */
+        gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
+        gtk_widget_show(pixmapwid);
+    }
+    else
+    {
+        /* Case 4) Simply replace the pixmap */
+        gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+    }
+
+    nb_page->m_image = image;
+
+    return TRUE;
 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
-  wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+    wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+    wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
 }
 
-bool wxNotebook::DeleteAllPages()
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 {
-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
-
-  wxNode *page_node = m_pages.First();
-  while (page_node)
-  {
-    wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+}
 
-    DeletePage( page->m_id );
+bool wxNotebook::DeleteAllPages()
+{
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-    page_node = m_pages.First();
-  }
+    while (m_pages.GetCount() > 0)
+        DeletePage( m_pages.GetCount()-1 );
 
-  return TRUE;
+    return TRUE;
 }
 
 bool wxNotebook::DeletePage( int page )
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page) return FALSE;
-
-  int page_num = 0;
-  GList *child = GTK_NOTEBOOK(m_widget)->children;
-  while (child)
-  {
-    if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
-    page_num++;
-    child = child->next;
-  }
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (!nb_page) return FALSE;
 
-  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    /* GTK sets GtkNotebook.cur_page to NULL before sending
+       the switvh page event */
+    m_lastSelection = GetSelection();
 
-  delete nb_page->m_client;
+    nb_page->m_client->Destroy();
+    m_pages.DeleteObject( nb_page );
 
-  m_pages.DeleteObject( nb_page );
+    m_lastSelection = -1;
 
-  return TRUE;
+    return TRUE;
 }
 
 bool wxNotebook::RemovePage( int page )
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page) return FALSE;
-
-  int page_num = 0;
-  GList *child = GTK_NOTEBOOK(m_widget)->children;
-  while (child)
-  {
-    if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
-    page_num++;
-    child = child->next;
-  }
+    wxNotebookPage* nb_page = GetNotebookPage(page);
 
-  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    if (!nb_page) return FALSE;
 
-  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+    gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
-  m_pages.DeleteObject( nb_page );
+    m_pages.DeleteObject( nb_page );
 
-  return TRUE;
+    return TRUE;
 }
 
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
-                         bool bSelect, int imageId)
+bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
+                             bool select, int imageId )
 {
-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
 
-  // we've created the notebook page in AddChild(). Now we just have to set
-  // the caption for the page and set the others parameters.
+    wxCHECK_MSG( win->GetParent() == this, FALSE,
+               wxT("Can't add a page whose parent is not the notebook!") );
 
-  wxNotebookPage *page = (wxNotebookPage *) NULL;
+    /* 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 );
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if ( page->m_client == win ) break;
-    node = node->Next();
-  }
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
-  wxCHECK_MSG( page != NULL, FALSE,
-               "Can't add a page whose parent is not the notebook!" );
+    wxNotebookPage *page = new wxNotebookPage();
 
-  wxCHECK_MSG( page->Add(), FALSE,
-               "Can't add the same page twice to a notebook." );
+    if (position < 0)
+        m_pages.Append( page );
+    else
+        m_pages.Insert( m_pages.Nth( position ), page );
 
-  if (imageId != -1)
-  {
-    wxASSERT( m_imageList != NULL );
+    page->m_client = win;
 
-    const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
-    GdkPixmap *pixmap = bmp->GetPixmap();
-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    if ( bmp->GetMask() )
+    page->m_box = gtk_hbox_new( FALSE, 0 );
+    gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
+
+    gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
+      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+
+    if (position < 0)
+        gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
+    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;
+
+    if (imageId != -1)
     {
-      mask = bmp->GetMask()->GetBitmap();
+        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();
+        }
+
+        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+
+        gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+
+        gtk_widget_show(pixmapwid);
     }
 
-    GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+    /* set the label text */
+    page->m_text = text;
+    if (page->m_text.IsEmpty()) page->m_text = wxT("");
 
-    gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, 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 );
 
-    gtk_widget_show(pixmapwid);
-  }
+    /* show the label */
+    gtk_widget_show( GTK_WIDGET(page->m_label) );
 
-  // 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_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+    if (select && (m_pages.GetCount() > 1))
+    {
+        if (position < 0)
+            SetSelection( GetPageCount()-1 );
+	else
+            SetSelection( position );
+    }
 
-  // @@@: what does this do? do we still need it?
-  // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-  gtk_widget_show((GtkWidget *)page->m_label);
+    return TRUE;
+}
 
-  if (bSelect) SetSelection(GetPageCount());
+bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+                         bool select, int imageId)
+{
+    return InsertPage( -1, win, text, select, imageId );
+}
 
-  return TRUE;
+void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
+{
+    if (event.IsWindowChange())
+        AdvanceSelection( event.GetDirection() );
+    else
+        event.Skip();
 }
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
-  wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
 
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return (wxWindow *) NULL;
-  else
-    return nb_page->m_client;
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (!nb_page)
+        return (wxWindow *) NULL;
+    else
+        return nb_page->m_client;
 }
 
 // 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);
+    // don't set the sizes of the pages - their correct size is not yet known
+    wxControl::SetConstraintSizes(FALSE);
 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
-  return TRUE;
+    return TRUE;
 }
 
 void wxNotebook::ApplyWidgetStyle()
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+{
+    return ((m_widget->window == window) ||
+            (GTK_NOTEBOOK(m_widget)->panel == window));
 }
 
 //-----------------------------------------------------------------------------
@@ -531,3 +641,4 @@ void wxNotebook::ApplyWidgetStyle()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
+#endif