uses wxString again (std::string optional)

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 0c0f939051a3fb7062328026becf0468e2b4ccd5..4021fcaf49d543d9076fc936f5c3eb0a9cf1b943 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -19,13 +19,40 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 

+//-----------------------------------------------------------------------------
+// wxNotebookPage
+//-----------------------------------------------------------------------------
+
+class wxNotebookPage: public wxObject
+{
+public:
+  wxNotebookPage()
+  {
+    m_id = -1;
+    m_text = "";
+    m_image = -1;
+    m_page = NULL;
+    m_client = NULL;
+    m_parent = NULL;
+  };
+
+//private:
+  int                m_id;
+  wxString           m_text;
+  int                m_image;
+  GtkNotebookPage   *m_page;
+  GtkLabel          *m_label;
+  wxWindow          *m_client;
+  GtkNotebook       *m_parent;
+};
+

 //-----------------------------------------------------------------------------
 // GTK callbacks
 //-----------------------------------------------------------------------------
 
 // page change callback
 //-----------------------------------------------------------------------------
 // GTK callbacks
 //-----------------------------------------------------------------------------
 
 // 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)
 {
                                               gint nPage,
                                               gpointer data)
 {


@@ -42,29 +69,24 @@ static void gtk_notebook_page_change_callback(GtkNotebook *widget,
   notebook->ProcessEvent(event);
 }
 
   notebook->ProcessEvent(event);
 }
 

-//-----------------------------------------------------------------------------
-// wxNotebookPage
-//-----------------------------------------------------------------------------
-
-class wxNotebookPage: public wxObject
+static void gtk_notebook_client_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, 
+                                               wxNotebookPage *page )

 {
 {

-public:
-  wxNotebookPage()
-  {
-    m_id = -1;
-    m_text = "";
-    m_image = -1;
-    m_page = NULL;
-    m_clientPanel = NULL;
-  };
-
-//private:
-  int                m_id;
-  wxString           m_text;
-  int                m_image;
-  GtkNotebookPage   *m_page;
-  GtkLabel          *m_label;
-  wxWindow          *m_clientPanel;
+  if (!page->m_client->HasVMT()) return;
+
+/*
+  printf( "OnResize from " );
+  if (page->m_client->GetClassInfo() && page->m_client->GetClassInfo()->GetClassName())
+    printf( page->m_client->GetClassInfo()->GetClassName() );
+  printf( ".\n" );
+
+  printf( "  New: X: %d  Y: %d ", alloc->x, alloc->y );
+  printf( "  W: %d  H: %d ", alloc->width, alloc->height );
+  printf( " .\n" );
+*/
+  
+  page->m_client->SetSize( alloc->x, alloc->y+26,
+                           alloc->width, alloc->height );

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


@@ -89,9 +111,9 @@ wxNotebook::wxNotebook()
   Init();
 };
 
   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 )

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


@@ -108,9 +130,9 @@ wxNotebook::~wxNotebook()
   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;
 


@@ -195,7 +217,7 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
     node = node->Next();
   };
 
     node = node->Next();
   };
 

-  wxLogDebug("Notebook page %d not found!", page);
+  wxLogDebug( "Notebook page %d not found!", page );

 
   return NULL;
 };
 
   return NULL;
 };


@@ -253,7 +275,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
   return TRUE;
 };
 
   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)
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)


@@ -305,7 +327,7 @@ bool wxNotebook::DeletePage( int page )
 
   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 );


@@ -328,7 +350,7 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();

-    if ( page->m_clientPanel == win )
+    if ( page->m_client == win )

       break; // found
     node = node->Next();
   };
       break; // found
     node = node->Next();
   };


@@ -356,29 +378,36 @@ wxWindow *wxNotebook::GetPage( int page ) const
   if (!nb_page)
     return NULL;
   else
   if (!nb_page)
     return NULL;
   else

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

 };
 
 void wxNotebook::AddChild( wxWindow *win )
 {
   // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
   // case is special there (Robert?)
 };
 
 void wxNotebook::AddChild( wxWindow *win )
 {
   // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
   // case is special there (Robert?)

+  // Robert: Don't you think the code below looks different from the one
+  // in wxWindow::AddChild :-)
+  

   m_children.Append(win);
 
   m_children.Append(win);
 

+  

   wxNotebookPage *page = new wxNotebookPage();
 
   page->m_id = GetPageCount();
   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);
+  page->m_label = (GtkLabel *)gtk_label_new("Handle");
+  page->m_client = 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);
 
   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_page = 
+    (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
+    
+  page->m_parent = GTK_NOTEBOOK(m_widget);

 
 

+  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+    GTK_SIGNAL_FUNC(gtk_notebook_client_size_callback), (gpointer)page );
+    

   if (!page->m_page)
   {
      wxLogFatalError( "Notebook page creation error" );
   if (!page->m_page)
   {
      wxLogFatalError( "Notebook page creation error" );


@@ -388,22 +417,6 @@ void wxNotebook::AddChild( wxWindow *win )
   m_pages.Append( page );
 };
 
   m_pages.Append( page );
 };
 

-void wxNotebook::OnSize(wxSizeEvent& event)
-{
-  // 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);
-
-    node = node->Next();
-  };
-}
-

 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxNotebookEvent
 //-----------------------------------------------------------------------------