//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
- GtkNotebookPage *WXUNUSED(gpage),
- guint page,
- wxNotebook *notebook )
+static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
+ GtkNotebookPage *WXUNUSED(gpage),
+ guint page,
+ wxNotebook *notebook )
{
- // are you trying to call SetSelection() from a notebook event handler?
- // you shouldn't!
- wxCHECK_RET( !notebook->m_inSwitchPage,
- _T("gtk_notebook_page_change_callback reentered") );
+ int old = gtk_notebook_get_current_page( widget );
- notebook->m_inSwitchPage = true;
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- int old = notebook->GetSelection();
-
-
- if (notebook->m_skipNextPageChangeEvent)
+ if ( !notebook->SendPageChangingEvent(page) )
{
- // this event was programatically generated by ChangeSelection() and thus must
- // be skipped
- notebook->m_skipNextPageChangeEvent = false;
-
- // make wxNotebook::GetSelection() return the correct (i.e. consistent
- // with wxNotebookEvent::GetSelection()) value even though the page is
- // not really changed in GTK+
- notebook->m_selection = page;
+ // program doesn't allow the page change
+ g_signal_stop_emission_by_name(notebook->m_widget, "switch_page");
}
else
{
- if ( !notebook->SendPageChangingEvent(page) )
- {
- // program doesn't allow the page change
- g_signal_stop_emission_by_name(notebook->m_widget, "switch_page");
- }
- else // change allowed
- {
- // make wxNotebook::GetSelection() return the correct (i.e. consistent
- // with wxNotebookEvent::GetSelection()) value even though the page is
- // not really changed in GTK+
- notebook->m_selection = page;
-
- notebook->SendPageChangedEvent(old);
- }
+ // the page change event also reports the old page
+ notebook->m_oldSelection = old;
}
+}
+}
- notebook->m_inSwitchPage = false;
+extern "C" {
+static void gtk_notebook_page_changed_callback( GtkNotebook *widget,
+ GtkNotebookPage *WXUNUSED(gpage),
+ guint page,
+ wxNotebook *notebook )
+{
+ int old = notebook->m_oldSelection;
+ notebook->SendPageChangedEvent( old );
}
}
return FALSE;
}
- // m_selection = page;
gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page );
return TRUE;
void wxNotebook::Init()
{
m_padding = 0;
- m_inSwitchPage = false;
- m_skipNextPageChangeEvent = false;
m_imageList = (wxImageList *) NULL;
- m_selection = -1;
+ m_oldSelection = -1;
m_themeEnabled = true;
}
gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
g_signal_connect (m_widget, "switch_page",
- G_CALLBACK (gtk_notebook_page_change_callback), this);
+ G_CALLBACK (gtk_notebook_page_changing_callback), this);
+
+ g_signal_connect_after (m_widget, "switch_page",
+ G_CALLBACK (gtk_notebook_page_changed_callback), this);
m_parent->DoAddChild( this );
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- if ( m_selection == -1 )
- {
- GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
-
- if (g_list_length(nb_pages) != 0)
- {
- GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-
- gpointer cur = notebook->cur_page;
- if ( cur != NULL )
- {
- wxConstCast(this, wxNotebook)->m_selection =
- g_list_index( nb_pages, cur );
- }
- }
- }
-
- return m_selection;
+ return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
}
wxString wxNotebook::GetPageText( size_t page ) const
int selOld = GetSelection();
if ( !(flags & SetSelection_SendEvent) )
- m_skipNextPageChangeEvent = true;
+ {
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) gtk_notebook_page_changing_callback,
+ this);
+
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) gtk_notebook_page_changed_callback,
+ this);
+ }
- // cache the selection
- m_selection = page;
gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
-#ifdef __WXDEBUG__
if ( !(flags & SetSelection_SendEvent) )
{
- // gtk_notebook_set_current_page will emit the switch-page signal which will be
- // caught by our gtk_notebook_page_change_callback which should have reset the
- // flag to false:
- wxASSERT(!m_skipNextPageChangeEvent);
+ // reconnect to signals
+
+ g_signal_connect (m_widget, "switch_page",
+ G_CALLBACK (gtk_notebook_page_changing_callback), this);
+
+ g_signal_connect_after (m_widget, "switch_page",
+ G_CALLBACK (gtk_notebook_page_changed_callback), this);
}
-#endif // __WXDEBUG__
wxNotebookPage *client = GetPage(page);
if ( client )
wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
- if ( m_selection != -1 && (size_t)m_selection >= page )
- {
- // the index will become invalid after the page is deleted
- m_selection = -1;
- }
-
wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
if ( !client )
return NULL;
// we don't need to unparent the client->m_widget; GTK+ will do
// that for us (and will throw a warning if we do it!)
- // gtk_notebook_remove_page() sends "switch_page" signal with some strange
- // new page index (when deleting selected page 0, new page is 1 although,
- // clearly, the selection should stay 0), so suppress this
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) gtk_notebook_page_change_callback,
- this);
-
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
- g_signal_connect (m_widget, "switch_page",
- G_CALLBACK (gtk_notebook_page_change_callback), this);
-
wxGtkNotebookPage* p = GetNotebookPage(page);
m_pagesData.DeleteObject(p);
delete p;
// hand here.
win->m_widget->parent = NULL;
- // don't receive switch page during addition
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) gtk_notebook_page_change_callback,
- this);
-
if (m_themeEnabled)
win->SetThemeEnabled(true);
/* show the label */
gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
+
if (select && (m_pagesData.GetCount() > 1))
{
- SetSelection( position );
+ SetSelection( position );
}
- g_signal_connect (m_widget, "switch_page",
- G_CALLBACK (gtk_notebook_page_change_callback), this);
-
InvalidateBestSize();
return true;
}
projects / wxWidgets.git / blobdiff