items without children couldn't be expanded even after a call to

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index c58f048ccbcd289b80350014379264a6f77c5c7f..ec2257fb24ec0ec567898ce25e59b9aa7854cc1a 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -2,10 +2,9 @@
 // Name:        notebook.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        notebook.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,6 +15,8 @@
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"

+#include "wx/intl.h"
+#include "wx/log.h"

 
 //-----------------------------------------------------------------------------
 // wxNotebookPage
 
 //-----------------------------------------------------------------------------
 // wxNotebookPage


@@ -23,288 +24,304 @@
 
 class wxNotebookPage: public wxObject
 {
 
 class wxNotebookPage: public wxObject
 {

-  public:
-  
-   int                m_id;
-   wxString           m_text;
-   int                m_image;
-   void              *m_clientData;
-   GtkNotebookPage   *m_page;
-   wxPanel           *m_clientPanel;
-   
-   wxNotebookPage(void)
-   {
-     m_id = -1;
-     m_text = "";
-     m_image = -1;
-     m_clientData = NULL;
-     m_page = NULL;
-     m_clientPanel = NULL;
-   };
-   
+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

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxNotebook
+// "switch_page"

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

-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
-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 );
+}
+
+//-----------------------------------------------------------------------------
+// wxNotebook
+//-----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 

-wxNotebook::wxNotebook(void)
+void wxNotebook::Init()

 {
 {

-  m_imageList = NULL;
-  m_frame = NULL;
+  m_imageList = (wxImageList *) NULL;

   m_pages.DeleteContents( TRUE );
   m_pages.DeleteContents( TRUE );

-};
+  m_idHandler = 0;
+}
+
+wxNotebook::wxNotebook()
+{
+  Init();
+}

 
 

-wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id, 
+wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,

       const wxPoint& pos, const wxSize& size,
       const wxPoint& pos, const wxSize& size,

-      const long style, const wxString& name )
+      long style, const wxString& name )

 {
 {

-  m_imageList = NULL;
-  m_frame = NULL;
-  m_pages.DeleteContents( TRUE );
+  Init();

   Create( parent, id, pos, size, style, name );
   Create( parent, id, pos, size, style, name );

-};
+}

 
 

-wxNotebook::~wxNotebook(void)
+wxNotebook::~wxNotebook()

 {
 {

-  if (m_imageList) delete m_imageList;
+  // don't generate change page events any more
+  if (m_idHandler != 0)
+    gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
+

   DeleteAllPages();
   DeleteAllPages();

-};
+}

 
 

-bool wxNotebook::Create(wxWindow *parent, const wxWindowID id, 
+bool wxNotebook::Create(wxWindow *parent, wxWindowID id,

       const wxPoint& pos, const wxSize& size,
       const wxPoint& pos, const wxSize& size,

-      const long style, const wxString& name )
+      long style, const wxString& name )

 {
   m_needParent = TRUE;
 {
   m_needParent = TRUE;

-  
+

   PreCreation( parent, id, pos, size, style, name );
 
   m_widget = gtk_notebook_new();
   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",
+                  GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
+                  (gpointer)this
+                );
+

   PostCreation();
   PostCreation();

-  
+

   Show( TRUE );
   Show( TRUE );

-  
+

   return TRUE;
   return TRUE;

-};
+}

 
 

-int wxNotebook::GetSelection(void) const
+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 (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)
   {
     page = (wxNotebookPage*)node->Data();
 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();

-    if (page->m_page == g_page) break;
+    if (page->m_page == g_page)
+      break;

     node = node->Next();
     node = node->Next();

-  };
-  
-  if (!node) wxFatalError( "Notebook error." );
-  
-  return page->m_id;
-};
+  }

 
 

-wxImageList* wxNotebook::GetImageList(void) const
-{
-  return m_imageList;
-};
+  wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );

 
 

-int wxNotebook::GetPageCount(void) const
+  return page->m_id;
+}
+
+int wxNotebook::GetPageCount() const

 {
   return m_pages.Number();
 {
   return m_pages.Number();

-};
+}

 
 

-int wxNotebook::GetRowCount(void) const
+int wxNotebook::GetRowCount() const

 {
   return 1;
 {
   return 1;

-};
+}

 
 

-wxString wxNotebook::GetPageText( const int page ) const
+wxString wxNotebook::GetPageText( int page ) const

 {
 {

-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return "";
+  wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );

   
   

-  return nb_page->m_text;
-};
-
-int wxNotebook::GetPageImage( const int page ) const
+  wxNotebookPage* nb_page = GetNotebookPage(page);
+  if (nb_page)
+    return nb_page->m_text;
+  else
+    return "";
+}
+
+int wxNotebook::GetPageImage( int page ) const

 {
 {

-  wxNotebookPage *nb_page = NULL;
+  wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return -1;
-  
-  return nb_page->m_image;
-};
+  wxNotebookPage* nb_page = GetNotebookPage(page);
+  if (nb_page)
+    return nb_page->m_image;
+  else
+    return 0;
+}

 
 

-void* wxNotebook::GetPageData( const int page ) const
+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)
   {
     nb_page = (wxNotebookPage*)node->Data();
 
   wxNode *node = m_pages.First();
   while (node)
   {
     nb_page = (wxNotebookPage*)node->Data();

-    if (nb_page->m_id == page) break;
+    if (nb_page->m_id == page)
+      return nb_page;

     node = node->Next();
     node = node->Next();

-  };
-  if (!node) return NULL;
-  
-  return nb_page->m_clientData;
-};
+  }
+
+  wxLogDebug( "Notebook page %d not found!", page );
+
+  return (wxNotebookPage *) NULL;
+}

 
 

-int wxNotebook::SetSelection( const int page )
+int wxNotebook::SetSelection( int page )

 {
 {

-  wxNotebookPage *nb_page = NULL;
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return -1;
+  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)
   {
   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;
     page_num++;
     child = child->next;

-  };
-   
+  }
+

   if (!child) return -1;
   if (!child) return -1;

-  
+

   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );

-  
-  return page;
-};
+
+  return selOld;
+}
+
+void wxNotebook::AdvanceSelection( bool bForward )
+{
+  wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+
+  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;
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
   m_imageList = imageList;

-};
+}

 
 

-bool wxNotebook::SetPageText( const int page, const wxString &text )
+bool wxNotebook::SetPageText( int page, const wxString &text )

 {
 {

-  wxNotebookPage *nb_page = NULL;
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
+  wxNotebookPage* nb_page = GetNotebookPage(page);

   
   

+  if (!nb_page) return FALSE;
+

   nb_page->m_text = text;
   nb_page->m_text = text;

- 
-  // recreate
-   
+

   return TRUE;
   return TRUE;

-};
+}

 
 

-bool wxNotebook::SetPageImage( const int page, const int image )
+bool wxNotebook::SetPageImage( int page, int image )

 {
 {

-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
+  wxNotebookPage* nb_page = GetNotebookPage(page);

   
   

-  nb_page->m_image = image;
- 
-  // recreate
-   
-  return TRUE;
-};
+  if (!nb_page) return FALSE;

 
 

-bool wxNotebook::SetPageData( const int page, void* data )
-{
-  wxNotebookPage *nb_page = NULL;
+  nb_page->m_image = image;

 
 

-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
-  
-  nb_page->m_clientData = data;
-  

   return TRUE;
   return TRUE;

-};
+}

 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {

-};
+  wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+}

 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {

- //  what's this ?
-};
+  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+}

 
 

-bool wxNotebook::DeleteAllPages(void)
+bool wxNotebook::DeleteAllPages()

 {
 {

+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+

   wxNode *page_node = m_pages.First();
   while (page_node)
   {
     wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
   wxNode *page_node = m_pages.First();
   while (page_node)
   {
     wxNotebookPage *page = (wxNotebookPage*)page_node->Data();

-    
+

     DeletePage( page->m_id );
     DeletePage( page->m_id );

-    
+

     page_node = m_pages.First();
     page_node = m_pages.First();

-  };
-  
+  }
+

   return TRUE;
   return TRUE;

-};
+}

 
 

-bool wxNotebook::DeletePage( const int page )
+bool wxNotebook::DeletePage( int page )

 {
 {

-  wxNotebookPage *nb_page = NULL;
-
-  wxNode *node = m_pages.First();
-  while (node)
-  {
-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
-    node = node->Next();
-  };
-  if (!node) return FALSE;
+  wxNotebookPage* nb_page = GetNotebookPage(page);
+  if (!nb_page) return FALSE;

 
   int page_num = 0;
   GList *child = GTK_NOTEBOOK(m_widget)->children;
 
   int page_num = 0;
   GList *child = GTK_NOTEBOOK(m_widget)->children;


@@ -313,77 +330,141 @@ bool wxNotebook::DeletePage( const int page )
     if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
     page_num++;
     child = child->next;
     if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
     page_num++;
     child = child->next;

-  };
+  }

 
   wxASSERT( child );
 
   wxASSERT( child );

-        
-  delete nb_page->m_clientPanel;
-  
+
+  delete nb_page->m_client;
+

 //  Amazingly, this is not necessary
 //  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 //  Amazingly, this is not necessary
 //  gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );

-  
+

   m_pages.DeleteObject( nb_page );
   m_pages.DeleteObject( nb_page );

-    
+

   return TRUE;
   return TRUE;

-};
+}

 
 

-wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data )
+bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+                         bool bSelect, int imageId)

 {
 {

-  wxNotebookPage *page = new wxNotebookPage;
-  
-  page->m_text = text;
-  if (page->m_text.IsNull()) page->m_text = "";
-  page->m_id = item;
-  page->m_image = imageId;
-  page->m_clientData = data;
-  
-  m_frame = gtk_label_new( page->m_text );
-  gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
-
-  page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
-    
-  m_frame = NULL;
-  
-  page->m_page = (GtkNotebookPage*)( g_list_last( GTK_NOTEBOOK(m_widget)->children )->data );
-  
-  if (!page->m_page) wxFatalError( "Notebook page creation error" );
-  
-  m_pages.Append( page );
+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );

 
 

-  return page->m_clientPanel;
-};
+  // we've created the notebook page in AddChild(). Now we just have to set
+  // the caption for the page and set the others parameters.

 
 

-wxPanel *wxNotebook::GetPanel( const int page )
-{
-  wxNotebookPage *nb_page = NULL;
+  wxNotebookPage *page = (wxNotebookPage *) NULL;

 
   wxNode *node = m_pages.First();
   while (node)
   {
 
   wxNode *node = m_pages.First();
   while (node)
   {

-    nb_page = (wxNotebookPage*)node->Data();
-    if (nb_page->m_id == page) break;
+    page = (wxNotebookPage*)node->Data();
+    if ( page->m_client == win ) break;

     node = node->Next();
     node = node->Next();

-  };
-  if (!node) return NULL;
-  
-  return nb_page->m_clientPanel;
-};
+  }
+
+  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();
+    }
+
+    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 = "";
+  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 (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 (wxWindow *) NULL;
+  else
+    return nb_page->m_client;
+}

 
 void wxNotebook::AddChild( wxWindow *win )
 {
 
 void wxNotebook::AddChild( wxWindow *win )
 {

-  if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
-  
-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
-};
+  wxCHECK_RET( m_widget != NULL, "invalid notebook" );

 
 

-//-----------------------------------------------------------------------------
-// wxTabEvent
-//-----------------------------------------------------------------------------
+  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;
+  }

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
+  m_pages.Append( page );
+}

 
 

-wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
-  wxCommandEvent(commandType, id)
+// 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);
+}
+
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
+{
+  return TRUE;
+}
+
+void wxNotebook::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+//-----------------------------------------------------------------------------
+// wxNotebookEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)