X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff829f3f6d9d138e36286ab7db81e93ac67cd598..6773ae198f4ff542231d85b4df7283af143d82eb:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 0c0f939051..b1ece83c05 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,29 +18,6 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
-//-----------------------------------------------------------------------------
-// GTK callbacks
-//-----------------------------------------------------------------------------
-
-// page change callback
-static void gtk_notebook_page_change_callback(GtkNotebook *widget,
-                                              GtkNotebookPage *page,
-                                              gint nPage,
-                                              gpointer data)
-{
-  wxNotebook *notebook = (wxNotebook *)data;
-
-  int nOld = notebook->GetSelection();
-
-  // TODO: emulate PAGE_CHANGING event
-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                        notebook->GetId(),
-                        nPage,
-                        nOld);
-  event.SetEventObject(notebook);
-  notebook->ProcessEvent(event);
-}
-
 //-----------------------------------------------------------------------------
 // wxNotebookPage
 //-----------------------------------------------------------------------------
@@ -54,32 +30,105 @@ public:
     m_id = -1;
     m_text = "";
     m_image = -1;
-    m_page = NULL;
-    m_clientPanel = NULL;
-  };
+    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_clientPanel;
+  wxWindow          *m_client;
+  GtkNotebook       *m_parent;
+  GtkWidget         *m_box;     // in which the label and image are packed
 };
 
 //-----------------------------------------------------------------------------
-// wxNotebook
+// "switch_page"
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
-  EVT_SIZE(wxNotebook::OnSize)
-END_EVENT_TABLE()
+static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
+                                              GtkNotebookPage *WXUNUSED(page),
+                                              gint nPage,
+                                              gpointer data)
+{
+  wxNotebook *notebook = (wxNotebook *)data;
+
+  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 );
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+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) &&
+      (win->m_height == alloc->height))
+  {
+    return;
+  }
+
+  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
+//-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 void wxNotebook::Init()
 {
-  m_imageList = NULL;
+  m_imageList = (wxImageList *) NULL;
   m_pages.DeleteContents( TRUE );
   m_idHandler = 0;
 }
@@ -87,36 +136,38 @@ void wxNotebook::Init()
 wxNotebook::wxNotebook()
 {
   Init();
-};
+}
 
-wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id,
+wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
-      const long style, const wxString& name )
+      long style, const wxString& name )
 {
   Init();
   Create( parent, id, pos, size, style, name );
-};
+}
 
 wxNotebook::~wxNotebook()
 {
   // don't generate change page events any more
-  if ( m_idHandler != 0 )
+  if (m_idHandler != 0)
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 
-  if (m_imageList)
-    delete m_imageList;
   DeleteAllPages();
-};
+}
 
-bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
+bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
-      const long style, const wxString& name )
+      long style, const wxString& name )
 {
   m_needParent = TRUE;
+  m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
   PreCreation( parent, id, pos, size, style, name );
 
   m_widget = gtk_notebook_new();
+
+  gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
+
   m_idHandler = gtk_signal_connect
                 (
                   GTK_OBJECT(m_widget), "switch_page",
@@ -124,21 +175,26 @@ bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
                   (gpointer)this
                 );
 
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
 
   Show( TRUE );
 
   return TRUE;
-};
+}
 
 int wxNotebook::GetSelection() const
 {
-  if (m_pages.Number() == 0)
-    return -1;
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+  
+  if (m_pages.Number() == 0) return -1;
 
   GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
 
-  wxNotebookPage *page = NULL;
+  wxNotebookPage *page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
   while (node)
@@ -147,44 +203,50 @@ int wxNotebook::GetSelection() const
     if (page->m_page == g_page)
       break;
     node = node->Next();
-  };
+  }
 
-  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?");
+  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
 
   return page->m_id;
-};
+}
 
 int wxNotebook::GetPageCount() const
 {
   return m_pages.Number();
-};
+}
 
 int wxNotebook::GetRowCount() const
 {
   return 1;
-};
+}
 
 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;
   else
     return "";
-};
+}
 
 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;
   else
     return 0;
-};
+}
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
-  wxNotebookPage *nb_page = NULL;
+  wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
+
+  wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
   while (node)
@@ -193,89 +255,94 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
     if (nb_page->m_id == page)
       return nb_page;
     node = node->Next();
-  };
+  }
 
-  wxLogDebug("Notebook page %d not found!", page);
+  wxLogDebug( "Notebook page %d not found!", page );
 
-  return NULL;
-};
+  return (wxNotebookPage *) NULL;
+}
 
 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;
+  
+  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;
+    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 );
 
   return selOld;
-};
+}
 
-void wxNotebook::AdvanceSelection(bool bForward)
+void wxNotebook::AdvanceSelection( bool bForward )
 {
-  int nSel = GetSelection(),
-      nMax = GetPageCount();
+  wxCHECK_RET( m_widget != NULL, "invalid notebook" );
 
-  if ( bForward ) {
-    SetSelection(nSel == nMax ? 0 : nSel + 1);
-  }
-  else {
-    SetSelection(nSel == 0 ? nMax : nSel - 1);
-  }
+  int sel = GetSelection();
+  int max = GetPageCount();
+
+  if (bForward) 
+    SetSelection( sel == max ? 0 : sel + 1 );
+  else
+    SetSelection( sel == 0 ? max : sel - 1 );
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
   m_imageList = 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;
+  
+  if (!nb_page) return FALSE;
 
   nb_page->m_text = text;
 
   return TRUE;
-};
+}
 
-bool wxNotebook::SetPageImage( int page, const int image )
+bool wxNotebook::SetPageImage( int page, int image )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
-  if (!nb_page)
-    return FALSE;
+  
+  if (!nb_page) return FALSE;
 
   nb_page->m_image = image;
 
   return TRUE;
-};
+}
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
-  wxFAIL_MSG("wxNotebook::SetPageSize not implemented");
-};
+  wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+}
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
-  wxFAIL_MSG("wxNotebook::SetPadding not implemented");
-};
+  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+}
 
 bool wxNotebook::DeleteAllPages()
 {
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+
   wxNode *page_node = m_pages.First();
   while (page_node)
   {
@@ -284,10 +351,10 @@ bool wxNotebook::DeleteAllPages()
     DeletePage( page->m_id );
 
     page_node = m_pages.First();
-  };
+  }
 
   return TRUE;
-};
+}
 
 bool wxNotebook::DeletePage( int page )
 {
@@ -301,107 +368,123 @@ bool wxNotebook::DeletePage( int page )
     if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
     page_num++;
     child = child->next;
-  };
+  }
+
+  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
 
-  wxASSERT( child );
+  delete nb_page->m_client;
+
+  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;
+  }
 
-  delete nb_page->m_clientPanel;
+  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
 
-//  Amazingly, this is not necessary
-//  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 
   m_pages.DeleteObject( nb_page );
 
   return TRUE;
-};
+}
 
 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.
 
-  // first, find the page
-  wxNotebookPage *page = NULL;
+  wxNotebookPage *page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
-    if ( page->m_clientPanel == win )
-      break; // found
+    if ( page->m_client == win ) break;
     node = node->Next();
-  };
+  }
+
+  wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
+
+  if (imageId != -1) 
+  {
+    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();
+    }
 
-  wxCHECK_MSG(page != NULL, FALSE,
-              "Can't add a page whose parent is not the notebook!");
+    GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+
+    gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+
+    gtk_widget_show(pixmapwid);
+  }
 
   // then set the attributes
   page->m_text = text;
-  if ( page->m_text.IsEmpty() )
-    page->m_text = "";
+  if (page->m_text.IsEmpty()) page->m_text = "";
   page->m_image = imageId;
-  gtk_label_set(page->m_label, page->m_text);
+  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 ( bSelect ) {
-    SetSelection(GetPageCount());
-  }
+  // @@@: 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 (bSelect) SetSelection(GetPageCount());
 
   return TRUE;
-};
+}
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
+  wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)
-    return NULL;
+    return (wxWindow *) NULL;
   else
-    return nb_page->m_clientPanel;
-};
+    return nb_page->m_client;
+}
 
-void wxNotebook::AddChild( wxWindow *win )
+// override these 2 functions to do nothing: everything is done in OnSize
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
-  // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
-  // case is special there (Robert?)
-  m_children.Append(win);
-
-  wxNotebookPage *page = new wxNotebookPage();
-
-  page->m_id = GetPageCount();
-  page->m_label = (GtkLabel *)gtk_label_new("no caption");
-  page->m_clientPanel = win;
-  gtk_notebook_append_page(GTK_NOTEBOOK(m_widget), win->m_widget,
-                           (GtkWidget *)page->m_label);
-  gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
-
-  page->m_page = (GtkNotebookPage*)
-                 (
-                    g_list_last(GTK_NOTEBOOK(m_widget)->children)->data
-                 );
-
-  if (!page->m_page)
-  {
-     wxLogFatalError( "Notebook page creation error" );
-     return;
-  }
-
-  m_pages.Append( page );
-};
+  // don't set the sizes of the pages - their correct size is not yet known
+  wxControl::SetConstraintSizes(FALSE);
+}
 
-void wxNotebook::OnSize(wxSizeEvent& event)
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
-  // forward this event to all pages
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    wxNotebookPage *page = (wxNotebookPage*)node->Data();
-    // @@@@ This -50 is completely wrong - instead, we should substract
-    //      the height of the tabs
-    page->m_clientPanel->SetSize(event.GetSize().GetX(),
-                                 event.GetSize().GetY() - 50);
+  return TRUE;
+}
 
-    node = node->Next();
-  };
+void wxNotebook::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
 //-----------------------------------------------------------------------------
@@ -409,3 +492,4 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
+