X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..bb69661b050ad2c774985e225cce0e497a875143:/src/gtk1/notebook.cpp?ds=sidebyside

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 0a3b30089d..6102168a49 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -2,9 +2,8 @@
 // Name:        notebook.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,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
 //-----------------------------------------------------------------------------
@@ -28,23 +58,18 @@ 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;
   }
 
-//private:
-  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
 };
 
@@ -54,19 +79,30 @@ public:
 
 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 event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                         notebook->GetId(),  nPage, old );
-  event.SetEventObject( notebook );
-  notebook->GetEventHandler()->ProcessEvent( event );
+    wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+                            notebook->GetId(), page, old );
+    event1.SetEventObject( notebook );
+    
+    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 );
 }
 
 //-----------------------------------------------------------------------------
@@ -75,17 +111,66 @@ 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->GetAutoLayout()) win->Layout();
+    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 );
 
-  if ((win->m_x == alloc->x) &&
-      (win->m_y == alloc->y) &&
-      (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height))
-  {
-    return;
-  }
+    if (win->GetAutoLayout()) win->Layout();
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if (!notebook->m_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;
 
-  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+    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;
+}
+
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+{
+    /* we don't do anything here but pray */
 }
 
 //-----------------------------------------------------------------------------
@@ -94,350 +179,451 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 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_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+
+    PreCreation( parent, id, pos, size, style, name );
+
+    m_widget = gtk_notebook_new();
+
+#ifdef __WXDEBUG__
+    debug_focus_in( m_widget, _T("wxNotebook::m_widget"), name );
+#endif
 
-  PreCreation( parent, id, pos, size, style, name );
+    gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
-  m_widget = gtk_notebook_new();
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-  gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
+    m_parent->DoAddChild( this );
 
-  m_idHandler = gtk_signal_connect
-                (
-                  GTK_OBJECT(m_widget), "switch_page",
-                  GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
-                  (gpointer)this
-                );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
+      GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );
 
-  PostCreation();
+    PostCreation();
 
-  Show( TRUE );
+    Show( TRUE );
 
-  return TRUE;
+    return TRUE;
 }
 
 int wxNotebook::GetSelection() const
 {
-  if (m_pages.Number() == 0) return -1;
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
 
-  GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+    GList *pages = GTK_NOTEBOOK(m_widget)->children;
 
-  wxNotebookPage *page = (wxNotebookPage *) NULL;
+    if (g_list_length(pages) == 0) return -1;
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if (page->m_page == g_page)
-      break;
-    node = node->Next();
-  }
-
-  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
-
-  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
 {
-  return m_pages.Number();
+    return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
 }
 
 int wxNotebook::GetRowCount() const
 {
-  return 1;
+    return 1;
 }
 
 wxString wxNotebook::GetPageText( int page ) const
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_text;
-  else
-    return "";
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") );
+
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (nb_page)
+        return nb_page->m_text;
+    else
+        return "";
 }
 
 int wxNotebook::GetPageImage( int page ) const
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (nb_page)
-    return nb_page->m_image;
-  else
-    return 0;
+    wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
+
+    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
 {
-  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, (wxNotebookPage*) NULL, _T("invalid notebook") );
 
-  wxLogDebug( "Notebook page %d not found!", page );
-
-  return (wxNotebookPage *) NULL;
+    wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, _T("invalid notebook index") );
+    
+    wxNode *node = m_pages.Nth( page );
+    
+    return (wxNotebookPage *) node->Data();
 }
 
 int wxNotebook::SetSelection( int page )
 {
-  int selOld = GetSelection();
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  
-  if (!nb_page) return -1;
-
-  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( m_widget != NULL, -1, _T("invalid notebook") );
 
-  if (!child) return -1;
+    wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, _T("invalid notebook index") );
 
-  gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+    int selOld = GetSelection();
+    
+    gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
-  return selOld;
+    return selOld;
 }
 
-void wxNotebook::AdvanceSelection( bool bForward )
+void wxNotebook::AdvanceSelection( bool forward )
 {
-  int sel = GetSelection();
-  int max = GetPageCount();
+    wxCHECK_RET( m_widget != NULL, _T("invalid notebook") );
 
-  if (bForward) 
-    SetSelection( sel == max ? 0 : sel + 1 );
-  else
-    SetSelection( sel == 0 ? max : sel - 1 );
+    int sel = GetSelection();
+    int max = GetPageCount();
+
+    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 )
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  
-  if (!nb_page) return FALSE;
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
+
+    wxNotebookPage* nb_page = GetNotebookPage(page);
 
-  nb_page->m_text = text;
+    wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") );
 
-  return TRUE;
+    nb_page->m_text = text;
+
+    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);
-  
-  if (!nb_page) return FALSE;
+    /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
+
+    wxNotebookPage* nb_page = GetNotebookPage(page);
 
-  nb_page->m_image = image;
+    if (!nb_page) return FALSE;
 
-  return TRUE;
+    /* 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 (image == -1 && nb_page->m_image == -1)
+        return TRUE; /* Case 1): Nothing to do. */
+
+    GtkWidget *pixmapwid = (GtkWidget*) NULL;
+
+    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( _T("wxNotebook::SetPageSize not implemented") );
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") );
+}
+
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
+{
+    wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") );
 }
 
 bool wxNotebook::DeleteAllPages()
 {
-  wxNode *page_node = m_pages.First();
-  while (page_node)
-  {
-    wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
 
-    DeletePage( page->m_id );
+    while (m_pages.GetCount() > 0)
+        DeletePage( m_pages.GetCount()-1 );
 
-    page_node = m_pages.First();
-  }
-
-  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;
-  }
-
-  wxASSERT( child );
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    if (!nb_page) return FALSE;
+
+    /* GTK sets GtkNotebook.cur_page to NULL before sending
+       the switvh page event */
+    m_lastSelection = GetSelection();
+    
+    nb_page->m_client->Destroy();
+    m_pages.DeleteObject( nb_page );
+    
+    m_lastSelection = -1;
+
+    return TRUE;
+}
 
-  delete nb_page->m_client;
+bool wxNotebook::RemovePage( int page )
+{
+    wxNotebookPage* nb_page = GetNotebookPage(page);
+    
+    if (!nb_page) return FALSE;
 
-//  Amazingly, this is not necessary
-//  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 )
 {
-  // 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( m_widget != NULL, FALSE, _T("invalid notebook") );
+
+    wxCHECK_MSG( win->GetParent() == this, FALSE,
+               _T("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), 
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
+      
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+
+    wxNotebookPage *page = new wxNotebookPage();
+    
+    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 );
+    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)
+    {
+        wxASSERT( m_imageList != NULL );
 
-  wxNotebookPage *page = (wxNotebookPage *) NULL;
+        const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+        GdkPixmap *pixmap = bmp->GetPixmap();
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        if ( bmp->GetMask() )
+        {
+            mask = bmp->GetMask()->GetBitmap();
+        }
 
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    page = (wxNotebookPage*)node->Data();
-    if ( page->m_client == win ) break;
-    node = node->Next();
-  }
+        GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
 
-  wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
-
-  if (imageId != -1) 
-  {
-    wxASSERT( m_imageList != NULL );
+        gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
 
-    const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
-    GdkPixmap *pixmap = bmp->GetPixmap();
-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    if ( bmp->GetMask() )
-    {
-      mask = bmp->GetMask()->GetBitmap();
+        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 = _T("");
+    
+    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_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+    /* show the label */
+    gtk_widget_show( GTK_WIDGET(page->m_label) );
 
-    gtk_widget_show(pixmapwid);
-  }
-
-  // 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);
-
-  // @@@: what does this do? do we still need it?
-  // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
-
-  gtk_widget_show((GtkWidget *)page->m_label);
+    if (select && (m_pages.GetCount() > 1))
+    {
+        if (position < 0)
+            SetSelection( GetPageCount()-1 );
+	else
+            SetSelection( position );
+    }
 
-  if (bSelect) SetSelection(GetPageCount());
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+      GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
-  return TRUE;
+    return TRUE;
 }
 
-wxWindow *wxNotebook::GetPage( int page ) const
+bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+                         bool select, int imageId)
 {
-  wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return (wxWindow *) NULL;
-  else
-    return nb_page->m_client;
+    return InsertPage( -1, win, text, select, imageId );
 }
 
-void wxNotebook::AddChild( wxWindow *win )
+void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
-  m_children.Append(win);
-
-  wxNotebookPage *page = new wxNotebookPage();
-
-  page->m_id = GetPageCount();
-
-  page->m_box = gtk_hbox_new (FALSE, 0);
-  gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
-
-  page->m_client = win;
-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, page->m_box );
-
-  page->m_page =
-    (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
-
-  page->m_parent = GTK_NOTEBOOK(m_widget);
-
-  gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
+    if (event.IsWindowChange())
+        AdvanceSelection( event.GetDirection() );
+    else
+        event.Skip();
+}
 
-  if (!page->m_page)
-  {
-     wxLogFatalError( "Notebook page creation error" );
-     return;
-  }
+wxWindow *wxNotebook::GetPage( int page ) const
+{
+    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") );
 
-  m_pages.Append( page );
+    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 );
+}
+
+bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+{
+    return ((m_widget->window == window) ||
+            (GTK_NOTEBOOK(m_widget)->panel == window));
 }
 
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
+#endif
\ No newline at end of file