m_client = (wxWindow *) NULL;
m_parent = (GtkNotebook *) NULL;
m_box = (GtkWidget *) NULL;
+ m_added = FALSE;
}
-//private:
+ // mark page as "added' to the notebook, return FALSE if the page was
+ // already added
+ bool Add()
+ {
+ if ( WasAdded() )
+ return FALSE;
+
+ m_added = TRUE;
+ return TRUE;
+ }
+
+ bool WasAdded() const { return m_added; }
+
int m_id;
wxString m_text;
int m_image;
wxWindow *m_client;
GtkNotebook *m_parent;
GtkWidget *m_box; // in which the label and image are packed
+
+private:
+ bool m_added;
};
//-----------------------------------------------------------------------------
int old = notebook->GetSelection();
// TODO: emulate PAGE_CHANGING event
-
+
wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
notebook->GetId(), nPage, old );
event.SetEventObject( notebook );
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) &&
win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
}
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxNotebook
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+{
+ wxNotebookPage *page = new wxNotebookPage();
+
+ page->m_id = parent->GetPageCount();
+
+ 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;
+ }
+
+ parent->m_pages.Append( page );
+}
+
//-----------------------------------------------------------------------------
// wxNotebook
//-----------------------------------------------------------------------------
long style, const wxString& name )
{
m_needParent = TRUE;
+ m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
PreCreation( parent, id, pos, size, style, name );
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),
- (gpointer)this
- );
+ (gpointer)this );
+
+ m_parent->AddChild( this );
+
+ (m_parent->m_insertCallback)( m_parent, this );
PostCreation();
int wxNotebook::GetSelection() const
{
wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
-
+
if (m_pages.Number() == 0) return -1;
GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+ if (!g_page) return -1;
wxNotebookPage *page = (wxNotebookPage *) NULL;
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();
}
int wxNotebook::GetPageCount() const
{
- return m_pages.Number();
+ // count only the pages which were already added to the notebook for MSW
+ // compatibility (and, in fact, this behaviour makes more sense anyhow
+ // because only the added pages are shown)
+ int n = 0;
+ for ( wxNode *node = m_pages.First(); node; node = node->Next() )
+ {
+ wxNotebookPage *page = (wxNotebookPage*)node->Data();
+ if ( page->WasAdded() )
+ n++;
+ }
+
+ return n;
}
int wxNotebook::GetRowCount() 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;
int selOld = GetSelection();
wxNotebookPage* nb_page = GetNotebookPage(page);
-
+
if (!nb_page) return -1;
int page_num = 0;
int sel = GetSelection();
int max = GetPageCount();
- if (bForward)
+ if (bForward)
SetSelection( sel == max ? 0 : sel + 1 );
else
SetSelection( sel == 0 ? max : sel - 1 );
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
wxNotebookPage* nb_page = GetNotebookPage(page);
-
+
if (!nb_page) return FALSE;
nb_page->m_text = text;
bool wxNotebook::SetPageImage( int page, int image )
{
wxNotebookPage* nb_page = GetNotebookPage(page);
-
+
if (!nb_page) return FALSE;
nb_page->m_image = image;
child = child->next;
}
- wxASSERT( child );
+ wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
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 );
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)
+ wxCHECK_MSG( page->Add(), FALSE,
+ "Can't add the same page twice to a notebook." );
+
+ if (imageId != -1)
{
wxASSERT( m_imageList != NULL );
return nb_page->m_client;
}
-void wxNotebook::AddChild( wxWindow *win )
-{
- wxCHECK_RET( m_widget != NULL, "invalid notebook" );
-
- 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) )
{
projects / wxWidgets.git / blobdiff