Rewrote wxRadioBox (recompile)

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index eb1ac6d1b55a4f2d56dd689b14493c2564c12113..2794bebe86262040ebd5ab636375a3f50987a124 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -20,66 +20,84 @@
 #include "wx/log.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/log.h"
 
 //-----------------------------------------------------------------------------

-// GTK callbacks
+// wxNotebookPage
+//-----------------------------------------------------------------------------
+
+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
+};
+
+//-----------------------------------------------------------------------------
+// "switch_page"

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

-// page change callback
-static void gtk_notebook_page_change_callback(GtkNotebook *widget,
-                                              GtkNotebookPage *page,
+static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
+                                              GtkNotebookPage *WXUNUSED(page),

                                               gint nPage,
                                               gpointer data)
 {
   wxNotebook *notebook = (wxNotebook *)data;
 
                                               gint nPage,
                                               gpointer data)
 {
   wxNotebook *notebook = (wxNotebook *)data;
 

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

 
   // TODO: emulate PAGE_CHANGING event
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
                         notebook->GetId(),
                         nPage,
 
   // TODO: emulate PAGE_CHANGING event
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
                         notebook->GetId(),
                         nPage,

-                        nOld);
-  event.SetEventObject(notebook);
-  notebook->ProcessEvent(event);
+                        old);
+  event.SetEventObject( notebook );
+  notebook->ProcessEvent( event );

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

-// wxNotebookPage
+// "size_allocate"

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

-class wxNotebookPage: public wxObject
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )

 {
 {

-public:
-  wxNotebookPage()
+  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))

   {
   {

-    m_id = -1;
-    m_text = "";
-    m_image = -1;
-    m_page = NULL;
-    m_clientPanel = NULL;
-  };
+    return;
+  }

 
 

-//private:
-  int                m_id;
-  wxString           m_text;
-  int                m_image;
-  GtkNotebookPage   *m_page;
-  GtkLabel          *m_label;
-  wxWindow          *m_clientPanel;
-};
+  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+}

 
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
-  EVT_SIZE(wxNotebook::OnSize)
-END_EVENT_TABLE()
-

 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 void wxNotebook::Init()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 void wxNotebook::Init()
 {

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

   m_pages.DeleteContents( TRUE );
   m_idHandler = 0;
 }
   m_pages.DeleteContents( TRUE );
   m_idHandler = 0;
 }


@@ -87,7 +105,7 @@ void wxNotebook::Init()
 wxNotebook::wxNotebook()
 {
   Init();
 wxNotebook::wxNotebook()
 {
   Init();

-};
+}

 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,


@@ -95,18 +113,16 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 {
   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
 
 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);
 
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 

-  if (m_imageList)
-    delete m_imageList;

   DeleteAllPages();
   DeleteAllPages();

-};
+}

 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,


@@ -117,6 +133,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
   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",
   m_idHandler = gtk_signal_connect
                 (
                   GTK_OBJECT(m_widget), "switch_page",


@@ -129,16 +148,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;

-};
+}

 
 int wxNotebook::GetSelection() const
 {
 
 int wxNotebook::GetSelection() const
 {

-  if (m_pages.Number() == 0)
-    return -1;
+  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;
 

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

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


@@ -147,22 +165,22 @@ int wxNotebook::GetSelection() const
     if (page->m_page == g_page)
       break;
     node = node->Next();
     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;
 
   return page->m_id;

-};
+}

 
 int wxNotebook::GetPageCount() const
 {
   return m_pages.Number();
 
 int wxNotebook::GetPageCount() const
 {
   return m_pages.Number();

-};
+}

 
 int wxNotebook::GetRowCount() const
 {
   return 1;
 
 int wxNotebook::GetRowCount() const
 {
   return 1;

-};
+}

 
 wxString wxNotebook::GetPageText( int page ) const
 {
 
 wxString wxNotebook::GetPageText( int page ) const
 {


@@ -171,7 +189,7 @@ wxString wxNotebook::GetPageText( int page ) const
     return nb_page->m_text;
   else
     return "";
     return nb_page->m_text;
   else
     return "";

-};
+}

 
 int wxNotebook::GetPageImage( int page ) const
 {
 
 int wxNotebook::GetPageImage( int page ) const
 {


@@ -180,11 +198,11 @@ int wxNotebook::GetPageImage( int page ) const
     return nb_page->m_image;
   else
     return 0;
     return nb_page->m_image;
   else
     return 0;

-};
+}

 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {

-  wxNotebookPage *nb_page = NULL;
+  wxNotebookPage *nb_page = (wxNotebookPage *) NULL;

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


@@ -193,86 +211,83 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
     if (nb_page->m_id == page)
       return nb_page;
     node = node->Next();
     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 )
 {
   int selOld = GetSelection();
   wxNotebookPage* nb_page = GetNotebookPage(page);
 
 int wxNotebook::SetSelection( int 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;

-  };
+  }

 
   if (!child) return -1;
 
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
 
   return selOld;
 
   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();
+  int sel = GetSelection();
+  int max = GetPageCount();

 
 

-  if ( bForward ) {
-    SetSelection(nSel == nMax ? 0 : nSel + 1);
-  }
-  else {
-    SetSelection(nSel == 0 ? nMax : nSel - 1);
-  }
+  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( int page, const wxString &text )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);

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

 
   nb_page->m_text = text;
 
   return TRUE;
 
   nb_page->m_text = text;
 
   return TRUE;

-};
+}

 
 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;
 
   return TRUE;
 
   nb_page->m_image = image;
 
   return TRUE;

-};
+}

 
 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()
 {


@@ -284,10 +299,10 @@ bool wxNotebook::DeleteAllPages()
     DeletePage( page->m_id );
 
     page_node = m_pages.First();
     DeletePage( page->m_id );
 
     page_node = m_pages.First();

-  };
+  }

 
   return TRUE;
 
   return TRUE;

-};
+}

 
 bool wxNotebook::DeletePage( int page )
 {
 
 bool wxNotebook::DeletePage( int page )
 {


@@ -301,11 +316,11 @@ bool wxNotebook::DeletePage( 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 );


@@ -313,7 +328,7 @@ bool wxNotebook::DeletePage( int page )
   m_pages.DeleteObject( nb_page );
 
   return TRUE;
   m_pages.DeleteObject( nb_page );
 
   return TRUE;

-};
+}

 
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)
 
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)


@@ -321,63 +336,80 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
   // 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 = 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_clientPanel == 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!");
+  if (imageId != -1) 
+  {
+    wxASSERT( m_imageList != NULL );
+
+    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;
 
   // 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_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;
 
   return TRUE;

-};
+}

 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)

-    return NULL;
+    return (wxWindow *) NULL;

   else
   else

-    return nb_page->m_clientPanel;
-};
+    return nb_page->m_client;
+}

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

-  // @@@ 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();
   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
-                 );
+  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)
   {
 
   if (!page->m_page)
   {


@@ -386,22 +418,18 @@ void wxNotebook::AddChild( wxWindow *win )
   }
 
   m_pages.Append( page );
   }
 
   m_pages.Append( page );

-};
+}

 
 

-void wxNotebook::OnSize(wxSizeEvent& event)
+// override these 2 functions to do nothing: everything is done in OnSize
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )

 {
 {

-  // 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);
+  // don't set the sizes of the pages - their correct size is not yet known
+  wxControl::SetConstraintSizes(FALSE);
+}

 
 

-    node = node->Next();
-  };
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
+{
+  return TRUE;

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


@@ -409,3 +437,4 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

+