bracketing msw enhanced metafile usage

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 1ace65dc16c324c8db6170b867231dc3b9447732..9d15dc42bd9631c041ab3adc32a04ef928005a88 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -61,10 +61,11 @@ static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*);
 
 extern "C" {
 static void
 
 extern "C" {
 static void

-switch_page_after(GtkWidget* widget, GtkNotebookPage*, guint, wxNotebook* win)
+switch_page_after(GtkNotebook* widget, GtkNotebookPage*, guint, wxNotebook* win)

 {
     g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);
 {
     g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);

-    win->SendPageChangedEvent(win->m_oldSelection);
+
+    win->GTKOnPageChanged();

 }
 }
 
 }
 }
 


@@ -202,7 +203,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
 int wxNotebook::GetSelection() const
 {
 
 int wxNotebook::GetSelection() const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );

 
     return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
 }
 
     return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
 }


@@ -217,7 +218,7 @@ wxString wxNotebook::GetPageText( size_t page ) const
 
 int wxNotebook::GetPageImage( size_t page ) const
 {
 
 int wxNotebook::GetPageImage( size_t page ) const
 {

-    wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");

 
     return GetNotebookPage(page)->m_imageIndex;
 }
 
     return GetNotebookPage(page)->m_imageIndex;
 }


@@ -229,7 +230,7 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 
 int wxNotebook::DoSetSelection( size_t page, int flags )
 {
 
 int wxNotebook::DoSetSelection( size_t page, int flags )
 {

-    wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");

 
     int selOld = GetSelection();
 
 
     int selOld = GetSelection();
 


@@ -245,6 +246,8 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
         g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
     }
 
         g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
     }
 

+    m_selection = page;
+

     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();
     wxNotebookPage *client = GetPage(page);
     if ( client )
         client->SetFocus();


@@ -252,6 +255,13 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
     return selOld;
 }
 
     return selOld;
 }
 

+void wxNotebook::GTKOnPageChanged()
+{
+    m_selection = gtk_notebook_get_current_page(GTK_NOTEBOOK(m_widget));
+
+    SendPageChangedEvent(m_oldSelection);
+}
+

 bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {
     wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");
 bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {
     wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");


@@ -357,7 +367,7 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;

-    
+

     return client;
 }
 
     return client;
 }
 


@@ -373,7 +383,7 @@ bool wxNotebook::InsertPage( size_t position,
                wxT("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( position <= GetPageCount(), false,
                wxT("Can't add a page whose parent is not the notebook!") );
 
     wxCHECK_MSG( position <= GetPageCount(), false,

-                 _T("invalid page index in wxNotebookPage::InsertPage()") );
+                 wxT("invalid page index in wxNotebookPage::InsertPage()") );

 
     // Hack Alert! (Part II): See above in wxNotebook::AddChildGTK
     // why this has to be done.
 
     // Hack Alert! (Part II): See above in wxNotebook::AddChildGTK
     // why this has to be done.