// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "notebook.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/notebook.h"
#if wxUSE_NOTEBOOK
#include "wx/imaglist.h"
#include "wx/intl.h"
#include "wx/log.h"
+#include "wx/bitmap.h"
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
gint page,
wxNotebook *notebook )
{
- static bool s_inPageChange = FALSE;
-
// are you trying to call SetSelection() from a notebook event handler?
// you shouldn't!
- wxCHECK_RET( !s_inPageChange,
+ wxCHECK_RET( !notebook->m_inSwitchPage,
_T("gtk_notebook_page_change_callback reentered") );
- s_inPageChange = TRUE;
+ notebook->m_inSwitchPage = TRUE;
if (g_isIdle)
wxapp_install_idle_handler();
notebook->GetEventHandler()->ProcessEvent( eventChanged );
}
- s_inPageChange = FALSE;
+ notebook->m_inSwitchPage = FALSE;
}
//-----------------------------------------------------------------------------
if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
{
int sel = win->GetSelection();
+ if (sel == -1)
+ return TRUE;
wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel);
wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
void wxNotebook::Init()
{
m_padding = 0;
+ m_inSwitchPage = FALSE;
+
m_imageList = (wxImageList *) NULL;
- m_pagesData.DeleteContents( TRUE );
m_selection = -1;
m_themeEnabled = TRUE;
}
wxNotebook::~wxNotebook()
{
- /* don't generate change page events any more */
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
- GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
-
DeleteAllPages();
}
return m_selection;
}
-wxString wxNotebook::GetPageText( int page ) const
+wxString wxNotebook::GetPageText( size_t page ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
return wxT("");
}
-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
return m_pagesData.Item(page)->GetData();
}
-int wxNotebook::SetSelection( int page )
+int wxNotebook::SetSelection( size_t page )
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- wxCHECK_MSG( page < (int)m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
+ wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
int selOld = GetSelection();
return selOld;
}
-bool wxNotebook::SetPageText( int page, const wxString &text )
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
{
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
return TRUE;
}
-bool wxNotebook::SetPageImage( int page, int image )
+bool wxNotebook::SetPageImage( size_t page, int image )
{
/* HvdH 28-12-98: now it works, but it's a bit of a kludge */
return wxNotebookBase::DeleteAllPages();
}
-bool wxNotebook::DeletePage( int page )
+bool wxNotebook::DeletePage( size_t page )
{
- // GTK sets GtkNotebook.cur_page to NULL before sending the switch page
- // event so we have to store the selection internally
- if ( m_selection == -1 )
+ if ( m_selection == (int)m_pagesData.GetCount() - 1 )
{
- m_selection = GetSelection();
- if ( m_selection == (int)m_pagesData.GetCount() - 1 )
- {
- // the index will become invalid after the page is deleted
- m_selection = -1;
- }
+ // the index will become invalid after the page is deleted
+ m_selection = -1;
}
// it will call our DoRemovePage() to do the real work
return wxNotebookBase::DeletePage(page);
}
-wxNotebookPage *wxNotebook::DoRemovePage( int page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
if ( !client )
gtk_widget_unrealize( client->m_widget );
gtk_widget_unparent( client->m_widget );
+ // 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
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
+
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
- m_pagesData.DeleteObject(GetNotebookPage(page));
+ gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
+
+ wxGtkNotebookPage* p = GetNotebookPage(page);
+ m_pagesData.DeleteObject(p);
+ delete p;
return client;
}
-bool wxNotebook::InsertPage( int position,
+bool wxNotebook::InsertPage( size_t position,
wxNotebookPage* win,
const wxString& text,
bool select,
wxCHECK_MSG( win->GetParent() == this, FALSE,
wxT("Can't add a page whose parent is not the notebook!") );
- wxCHECK_MSG( position >= 0 && position <= GetPageCount(), FALSE,
+ wxCHECK_MSG( position <= GetPageCount(), FALSE,
_T("invalid page index in wxNotebookPage::InsertPage()") );
/* don't receive switch page during addition */
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
- if (position < 0)
+#ifndef __VMS
+ // On VMS position is unsigned and thus always positive
+ if (position < 0)
gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
else
- gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
+#endif
+ gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
if (select && (m_pagesData.GetCount() > 1))
{
+#ifndef __VMS
+ // On VMS position is unsigned and thus always positive
if (position < 0)
SetSelection( GetPageCount()-1 );
else
- SetSelection( position );
+#endif
+ SetSelection( position );
}
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
projects / wxWidgets.git / blobdiff