Listctrl updates

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index dd41046ec1cd6e952cc2630fee12d6072c77e766..32f8f4744bc5bb2eab30c6d4e1f6eecbb4c2d13c 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -2,9 +2,8 @@
 // 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -37,7 +36,6 @@ public:
     m_box = (GtkWidget *) NULL;
   }
 
     m_box = (GtkWidget *) NULL;
   }
 

-//private:

   int                m_id;
   wxString           m_text;
   int                m_image;
   int                m_id;
   wxString           m_text;
   int                m_image;


@@ -49,10 +47,9 @@ public:
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// GTK callbacks
+// "switch_page"

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

-// page change callback

 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint nPage,
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint nPage,


@@ -60,22 +57,22 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 {
   wxNotebook *notebook = (wxNotebook *)data;
 
 {
   wxNotebook *notebook = (wxNotebook *)data;
 

-  int nOld = notebook->GetSelection();
+  int old = notebook->GetSelection();

 
   // TODO: emulate PAGE_CHANGING event
 
   // TODO: emulate PAGE_CHANGING event

-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                        notebook->GetId(),
-                        nPage,
-                        nOld);
-  event.SetEventObject(notebook);
-  notebook->ProcessEvent(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 )
 {
 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) &&
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&


@@ -83,29 +80,42 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
   {
     return;
   }
   {
     return;
   }

+  
+  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+}

 
 

-/*
-  printf( "OnResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( " .\n" );
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------

 
 

-  printf( "  Old: X: %d  Y: %d ", win->m_x, win->m_y );
-  printf( "  W: %d  H: %d ", win->m_width, win->m_height );
-  printf( " .\n" );
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+{
+  wxNotebookPage *page = new wxNotebookPage();

 
 

-  printf( "  New: X: %d  Y: %d ", alloc->x, alloc->y );
-  printf( "  W: %d  H: %d ", alloc->width, alloc->height );
-  printf( " .\n" );
-*/
+  page->m_id = parent->GetPageCount();

 
 

-  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+  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;
+  }

 
 

-/*
-  printf( "  Res: X: %d  Y: %d ", win->m_x, win->m_y );
-  printf( "  W: %d  H: %d ", win->m_width, win->m_height );
-  printf( " .\n" );
-*/
+  parent->m_pages.Append( page );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -137,7 +147,7 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 wxNotebook::~wxNotebook()
 {
   // don't generate change page events any more
 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);
 
   DeleteAllPages();
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 
   DeleteAllPages();


@@ -148,6 +158,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       long style, const wxString& name )
 {
   m_needParent = TRUE;
       long style, const wxString& name )
 {
   m_needParent = TRUE;

+  m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;

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


@@ -155,13 +166,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
   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),
                   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();
 
   Show( TRUE );
   PostCreation();
 
   Show( TRUE );


@@ -171,10 +184,12 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 int wxNotebook::GetSelection() const
 {
 
 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;
 
   GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;

+  if (!g_page) return -1;

 
   wxNotebookPage *page = (wxNotebookPage *) NULL;
 
 
   wxNotebookPage *page = (wxNotebookPage *) NULL;
 


@@ -182,8 +197,15 @@ int wxNotebook::GetSelection() const
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
   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();
   }
 
     node = node->Next();
   }
 


@@ -204,6 +226,8 @@ int wxNotebook::GetRowCount() const
 
 wxString wxNotebook::GetPageText( int page ) 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;
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (nb_page)
     return nb_page->m_text;


@@ -213,6 +237,8 @@ wxString wxNotebook::GetPageText( int page ) const
 
 int wxNotebook::GetPageImage( 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;
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (nb_page)
     return nb_page->m_image;


@@ -222,6 +248,8 @@ int wxNotebook::GetPageImage( int page ) const
 
 wxNotebookPage* wxNotebook::GetNotebookPage(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();
   wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();


@@ -240,17 +268,18 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 
 int wxNotebook::SetSelection( int page )
 {
 
 int wxNotebook::SetSelection( int page )
 {

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

   int selOld = GetSelection();
   wxNotebookPage* nb_page = GetNotebookPage(page);
   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)
   {
 
   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;
   }


@@ -262,17 +291,17 @@ int wxNotebook::SetSelection( int page )
   return selOld;
 }
 
   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 )
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )


@@ -282,9 +311,11 @@ void wxNotebook::SetImageList( wxImageList* imageList )
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {

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

   wxNotebookPage* nb_page = GetNotebookPage(page);
   wxNotebookPage* nb_page = GetNotebookPage(page);

-  if (!nb_page)
-    return FALSE;
+  
+  if (!nb_page) return FALSE;

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


@@ -294,8 +325,8 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 bool wxNotebook::SetPageImage( int page, int image )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
 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;
 
 
   nb_page->m_image = image;
 


@@ -304,16 +335,18 @@ bool wxNotebook::SetPageImage( int page, int image )
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
 
 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) )
 {
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {

-  wxFAIL_MSG(_("wxNotebook::SetPadding not implemented"));
+  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );

 }
 
 bool wxNotebook::DeleteAllPages()
 {
 }
 
 bool wxNotebook::DeleteAllPages()
 {

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

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


@@ -341,12 +374,32 @@ bool wxNotebook::DeletePage( int page )
     child = child->next;
   }
 
     child = child->next;
   }
 

-  wxASSERT( child );
+  wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );

 
   delete nb_page->m_client;
 
 
   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 );
 
 
   m_pages.DeleteObject( nb_page );
 


@@ -356,31 +409,36 @@ bool wxNotebook::DeletePage( int page )
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)
 {
 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.
 
   // 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 = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
   wxNotebookPage *page = (wxNotebookPage *) NULL;
 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();

-    if ( page->m_client == win )
-      break; // found
+    if ( page->m_client == win ) break;

     node = node->Next();
   }
 
     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!" );

 
 

-  // create the image if any
-  if ( imageId != -1 ) {
+  if (imageId != -1) 
+  {

     wxASSERT( m_imageList != NULL );
 
     wxASSERT( m_imageList != NULL );
 

-    wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+    const wxBitmap *bmp = m_imageList->GetBitmap(imageId);

     GdkPixmap *pixmap = bmp->GetPixmap();
     GdkPixmap *pixmap = bmp->GetPixmap();

-    GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, NULL /* @@@@ */);
+    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_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
 


@@ -389,27 +447,25 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 
   // then set the attributes
   page->m_text = text;
 
   // 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;
   page->m_label = (GtkLabel *)gtk_label_new(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);
+  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);
 
 
   // @@@: 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());
-  }
+  if (bSelect) SetSelection(GetPageCount());

 
   return TRUE;
 }
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
 
   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;
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)
     return (wxWindow *) NULL;


@@ -417,38 +473,6 @@ wxWindow *wxNotebook::GetPage( int page ) const
     return nb_page->m_client;
 }
 
     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) )
 {
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {


@@ -461,8 +485,15 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
   return TRUE;
 }
 
   return TRUE;
 }
 

+void wxNotebook::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+

 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

+