Implemented DoBlit().

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 1754454371b2c04db7a3f1fb2b51e7d6b4f377b3..9d70d97f45a1fe19836d2cc507d2eae0b9f23418 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -21,9 +21,9 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/win_gtk.h"

+

 #include <gdk/gdkkeysyms.h>
 
 // ----------------------------------------------------------------------------
 #include <gdk/gdkkeysyms.h>
 
 // ----------------------------------------------------------------------------


@@ -522,14 +522,11 @@ bool wxNotebook::DeleteAllPages()
 
     wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
 
 
     wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
 

-    return TRUE;
+    return wxNotebookBase::DeleteAllPages();

 }
 
 bool wxNotebook::DeletePage( int page )
 {
 }
 
 bool wxNotebook::DeletePage( int page )
 {

-    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
-    wxCHECK_MSG( nb_page, FALSE, _T("invalid page in wxNotebook::DeletePage") );
-

     // 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 )
     // 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 )


@@ -542,25 +539,23 @@ bool wxNotebook::DeletePage( int page )
         }
     }
 
         }
     }
 

-    m_pagesData.DeleteObject( nb_page );
-
+    // it will call our DoRemovePage() to do the real work

     return wxNotebookBase::DeletePage(page);
 }
 
 wxNotebookPage *wxNotebook::DoRemovePage( int page )
 {
     return wxNotebookBase::DeletePage(page);
 }
 
 wxNotebookPage *wxNotebook::DoRemovePage( int page )
 {

-    wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+    wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
+    if ( !client )
+        return NULL;

 
 

-    wxCHECK_MSG( nb_page, NULL, _T("wxNotebook::RemovePage: invalid page") );
-
-    wxNotebookPage *client = GetPage(page);

     gtk_widget_ref( client->m_widget );
     gtk_widget_unrealize( client->m_widget );
     gtk_widget_unparent( client->m_widget );
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 
     gtk_widget_ref( client->m_widget );
     gtk_widget_unrealize( client->m_widget );
     gtk_widget_unparent( client->m_widget );
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
 

-    m_pagesData.DeleteObject( nb_page );
+    m_pagesData.DeleteObject(GetNotebookPage(page));

 
     return client;
 }
 
     return client;
 }


@@ -691,7 +686,7 @@ void wxNotebook::ApplyWidgetStyle()
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 {
     return ((m_widget->window == window) ||
 bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
 {
     return ((m_widget->window == window) ||

-            (GTK_NOTEBOOK(m_widget)->panel == window));
+            (NOTEBOOK_PANEL(m_widget) == window));

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------