X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..650368d057896c5bf6b1f2294766e92b7dbb7f20:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index f006c328a0..0a71d34dd3 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -2,7 +2,7 @@
 // Name:        notebook.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,9 +34,22 @@ public:
     m_client = (wxWindow *) NULL;
     m_parent = (GtkNotebook *) NULL;
     m_box = (GtkWidget *) NULL;
+    m_added = FALSE;
   }
 
-//private:
+  // 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;
@@ -45,6 +58,9 @@ public:
   wxWindow          *m_client;
   GtkNotebook       *m_parent;
   GtkWidget         *m_box;     // in which the label and image are packed
+
+private:
+  bool m_added;
 };
 
 //-----------------------------------------------------------------------------
@@ -61,7 +77,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
   int old = notebook->GetSelection();
 
   // TODO: emulate PAGE_CHANGING event
-  
+
   wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
                          notebook->GetId(),  nPage, old );
   event.SetEventObject( notebook );
@@ -74,8 +90,6 @@ 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 ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&
@@ -87,6 +101,40 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }
 
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+{
+  wxNotebookPage *page = new wxNotebookPage();
+
+  page->m_id = parent->GetPageCount();
+
+  page->m_box = gtk_hbox_new (FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
+
+  GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
+
+  page->m_client = child;
+  gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
+
+  page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+
+  page->m_parent = notebook;
+
+  gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
+    GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
+
+  if (!page->m_page)
+  {
+     wxLogFatalError( "Notebook page creation error" );
+     return;
+  }
+
+  parent->m_pages.Append( page );
+}
+
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
@@ -127,6 +175,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       long style, const wxString& name )
 {
   m_needParent = TRUE;
+  m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
   PreCreation( parent, id, pos, size, style, name );
 
@@ -134,12 +183,14 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
-  m_idHandler = gtk_signal_connect
-                (
+  m_idHandler = gtk_signal_connect (
                   GTK_OBJECT(m_widget), "switch_page",
                   GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
-                  (gpointer)this
-                );
+                  (gpointer)this );
+
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
 
   PostCreation();
 
@@ -150,9 +201,12 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 int wxNotebook::GetSelection() const
 {
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+
   if (m_pages.Number() == 0) return -1;
 
   GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+  if (!g_page) return -1;
 
   wxNotebookPage *page = (wxNotebookPage *) NULL;
 
@@ -160,8 +214,15 @@ int wxNotebook::GetSelection() const
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
-    if (page->m_page == g_page)
-      break;
+
+    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();
   }
 
@@ -172,7 +233,18 @@ int wxNotebook::GetSelection() const
 
 int wxNotebook::GetPageCount() const
 {
-  return m_pages.Number();
+  // count only the pages which were already added to the notebook for MSW
+  // compatibility (and, in fact, this behaviour makes more sense anyhow
+  // because only the added pages are shown)
+  int n = 0;
+  for ( wxNode *node = m_pages.First(); node; node = node->Next() )
+  {
+    wxNotebookPage *page = (wxNotebookPage*)node->Data();
+    if ( page->WasAdded() )
+        n++;
+  }
+
+  return n;
 }
 
 int wxNotebook::GetRowCount() const
@@ -182,6 +254,8 @@ int wxNotebook::GetRowCount() const
 
 wxString wxNotebook::GetPageText( int page ) const
 {
+  wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );
+
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (nb_page)
     return nb_page->m_text;
@@ -191,6 +265,8 @@ wxString wxNotebook::GetPageText( int page ) const
 
 int wxNotebook::GetPageImage( int page ) const
 {
+  wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );
+
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (nb_page)
     return nb_page->m_image;
@@ -200,6 +276,8 @@ int wxNotebook::GetPageImage( int page ) const
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
+  wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
+
   wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
@@ -218,9 +296,11 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 
 int wxNotebook::SetSelection( int page )
 {
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+
   int selOld = GetSelection();
   wxNotebookPage* nb_page = GetNotebookPage(page);
-  
+
   if (!nb_page) return -1;
 
   int page_num = 0;
@@ -241,10 +321,12 @@ int wxNotebook::SetSelection( int page )
 
 void wxNotebook::AdvanceSelection( bool bForward )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+
   int sel = GetSelection();
   int max = GetPageCount();
 
-  if (bForward) 
+  if (bForward)
     SetSelection( sel == max ? 0 : sel + 1 );
   else
     SetSelection( sel == 0 ? max : sel - 1 );
@@ -257,8 +339,10 @@ void wxNotebook::SetImageList( wxImageList* imageList )
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+
   wxNotebookPage* nb_page = GetNotebookPage(page);
-  
+
   if (!nb_page) return FALSE;
 
   nb_page->m_text = text;
@@ -269,7 +353,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 bool wxNotebook::SetPageImage( int page, int image )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
-  
+
   if (!nb_page) return FALSE;
 
   nb_page->m_image = image;
@@ -289,6 +373,8 @@ void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 
 bool wxNotebook::DeleteAllPages()
 {
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+
   wxNode *page_node = m_pages.First();
   while (page_node)
   {
@@ -316,12 +402,32 @@ bool wxNotebook::DeletePage( int page )
     child = child->next;
   }
 
-  wxASSERT( child );
+  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
 
   delete nb_page->m_client;
 
-//  Amazingly, this is not necessary
-//  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+  m_pages.DeleteObject( nb_page );
+
+  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;
+  }
+
+  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+
+  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 
   m_pages.DeleteObject( nb_page );
 
@@ -331,6 +437,8 @@ bool wxNotebook::DeletePage( int page )
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)
 {
+  wxCHECK_MSG( m_widget != NULL, FALSE, "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.
 
@@ -344,9 +452,13 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
     node = node->Next();
   }
 
-  wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
+  wxCHECK_MSG( page != NULL, FALSE,
+               "Can't add a page whose parent is not the notebook!" );
+
+  wxCHECK_MSG( page->Add(), FALSE,
+               "Can't add the same page twice to a notebook." );
 
-  if (imageId != -1) 
+  if (imageId != -1)
   {
     wxASSERT( m_imageList != NULL );
 
@@ -384,6 +496,8 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
+  wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)
     return (wxWindow *) NULL;
@@ -391,37 +505,6 @@ wxWindow *wxNotebook::GetPage( int page ) const
     return nb_page->m_client;
 }
 
-void wxNotebook::AddChild( wxWindow *win )
-{
-  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 (!page->m_page)
-  {
-     wxLogFatalError( "Notebook page creation error" );
-     return;
-  }
-
-  m_pages.Append( page );
-}
-
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
@@ -434,6 +517,12 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
   return TRUE;
 }
 
+void wxNotebook::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------