notebook->ProcessEvent(event);
}
-static void gtk_notebook_client_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
- wxNotebookPage *page )
-{
- if (!page->m_client->HasVMT()) return;
-
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+{
+ 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 " );
- 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" );
*/
- 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" );
+*/
};
-
+
//-----------------------------------------------------------------------------
// 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);
-
wxNotebookPage *page = new wxNotebookPage();
page->m_id = GetPageCount();
(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);
-
- 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 );
-
+ 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" );
m_pages.Append( page );
};
+void wxNotebook::OnSize(wxSizeEvent& event)
+{
+ // forward this event to all pages
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ wxWindow *page = ((wxNotebookPage*)node->Data())->m_client;
+ // @@@@ the numbers I substract here are completely arbitrary, instead we
+ // should somehow calculate the size of the page from the size of the
+ // notebook
+/* page->SetSize(event.GetSize().GetX() - 5,
+ event.GetSize().GetY() - 30);
+
+ if ( page->GetAutoLayout() )
+ page->Layout();
+*/
+ node = node->Next();
+ };
+}
+
+// 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
//-----------------------------------------------------------------------------