New toolbar event processing

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 4021fcaf49d543d9076fc936f5c3eb0a9cf1b943..089d875e5c18a49b0958431630b2c12d838429d4 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -16,7 +16,6 @@
 #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"
 
 //-----------------------------------------------------------------------------
 #include "wx/log.h"
 
 //-----------------------------------------------------------------------------


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

-static void gtk_notebook_client_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, 
-                                               wxNotebookPage *page )
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )

 {
 {

-  if (!page->m_client->HasVMT()) return;
+  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;
+  };

 
 /*
   printf( "OnResize from " );
 
 /*
   printf( "OnResize from " );

-  if (page->m_client->GetClassInfo() && page->m_client->GetClassInfo()->GetClassName())
-    printf( page->m_client->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
+  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+    printf( win->GetClassInfo()->GetClassName() );
+  printf( " .\n" );
+
+  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" );

 
   printf( "  New: X: %d  Y: %d ", alloc->x, alloc->y );
   printf( "  W: %d  H: %d ", alloc->width, alloc->height );
   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 );
+
+  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+
+/*
+  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" );
+*/

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


@@ -125,8 +141,6 @@ wxNotebook::~wxNotebook()
   if ( m_idHandler != 0 )
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 
   if ( m_idHandler != 0 )
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 

-  if (m_imageList)
-    delete m_imageList;

   DeleteAllPages();
 };
 
   DeleteAllPages();
 };
 


@@ -139,6 +153,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",


@@ -387,10 +404,9 @@ void wxNotebook::AddChild( wxWindow *win )
   // case is special there (Robert?)
   // Robert: Don't you think the code below looks different from the one
   // in wxWindow::AddChild :-)
   // 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();


@@ -400,14 +416,14 @@ void wxNotebook::AddChild( wxWindow *win )
                             (GtkWidget *)page->m_label);
   gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
 
                             (GtkWidget *)page->m_label);
   gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
 

-  page->m_page = 
+  page->m_page =

     (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
     (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);

-    
+

   page->m_parent = GTK_NOTEBOOK(m_widget);
 
   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 );
-    
+  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" );
   if (!page->m_page)
   {
      wxLogFatalError( "Notebook page creation error" );


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

+// override these 2 functions to do nothing: everything is done in OnSize
+void wxNotebook::SetConstraintSizes(bool /* recurse */)
+{
+  // don't set the sizes of the pages - their correct size is not yet known
+  wxControl::SetConstraintSizes(FALSE);
+}
+
+bool wxNotebook::DoPhase(int /* nPhase */)
+{
+  return TRUE;
+}
+

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