X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22cbd10ea3ab5fead0bbb07107c45d584809fbc3..9d39cef7ef8f2dddce244846cca3a346508ae2af:/src/gtk/notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 0621f9fe5b..eff2994167 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -7,10 +7,13 @@
 // 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
@@ -189,6 +192,8 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
     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") );
 
@@ -238,7 +243,6 @@ void wxNotebook::Init()
     m_inSwitchPage = FALSE;
 
     m_imageList = (wxImageList *) NULL;
-    m_pagesData.DeleteContents( TRUE );
     m_selection = -1;
     m_themeEnabled = TRUE;
 }
@@ -336,7 +340,7 @@ int wxNotebook::GetSelection() const
     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") );
 
@@ -347,7 +351,7 @@ wxString wxNotebook::GetPageText( int page ) const
         return wxT("");
 }
 
-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
 
@@ -367,11 +371,11 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
     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();
 
@@ -386,7 +390,7 @@ int wxNotebook::SetSelection( int page )
     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") );
 
@@ -401,7 +405,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
     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 */
 
@@ -535,7 +539,7 @@ bool wxNotebook::DeleteAllPages()
     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
@@ -553,7 +557,7 @@ bool wxNotebook::DeletePage( int page )
     return wxNotebookBase::DeletePage(page);
 }
 
-wxNotebookPage *wxNotebook::DoRemovePage( int page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
@@ -565,12 +569,14 @@ wxNotebookPage *wxNotebook::DoRemovePage( int page )
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
-    m_pagesData.DeleteObject(GetNotebookPage(page));
+    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,
@@ -581,7 +587,7 @@ bool wxNotebook::InsertPage( int position,
     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 */