fixing non-precomp build, fixes #10985

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 4b81047c5f44c081026cc5eb1349b2c833cc18d2..1b821aad1e7bffc9a3ffb7e2959feec3de1b54ed 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -31,13 +31,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
 
 #include <gdk/gdkkeysyms.h>
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-

 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------


@@ -68,8 +61,8 @@ public:
     wxGtkNotebookPage()
     {
         m_image = -1;
     wxGtkNotebookPage()
     {
         m_image = -1;

-        m_page = (GtkNotebookPage *) NULL;
-        m_box = (GtkWidget *) NULL;
+        m_page = NULL;
+        m_box = NULL;

     }
 
     wxString           m_text;
     }
 
     wxString           m_text;


@@ -97,7 +90,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
     // are you trying to call SetSelection() from a notebook event handler?
     // you shouldn't!
     wxCHECK_RET( !notebook->m_inSwitchPage,
     // 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") );
+                 wxT("gtk_notebook_page_change_callback reentered") );

 
     notebook->m_inSwitchPage = true;
     if (g_isIdle)
 
     notebook->m_inSwitchPage = true;
     if (g_isIdle)


@@ -237,7 +230,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
         if (sel == -1)
             return TRUE;
         wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
         if (sel == -1)
             return TRUE;
         wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);

-        wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
+        wxCHECK_MSG( nb_page, FALSE, wxT("invalid selection in wxNotebook") );

 
         wxNavigationKeyEvent event;
         event.SetEventObject( notebook );
 
         wxNavigationKeyEvent event;
         event.SetEventObject( notebook );


@@ -298,7 +291,7 @@ void wxNotebook::Init()
     m_padding = 0;
     m_inSwitchPage = false;
 
     m_padding = 0;
     m_inSwitchPage = false;
 

-    m_imageList = (wxImageList *) NULL;
+    m_imageList = NULL;

     m_selection = -1;
     m_themeEnabled = true;
 }
     m_selection = -1;
     m_themeEnabled = true;
 }


@@ -415,9 +408,9 @@ int wxNotebook::GetPageImage( size_t page ) const
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {
 
 wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid notebook") );

 
 

-    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
+    wxCHECK_MSG( page < (int)m_pagesData.GetCount(), NULL, wxT("invalid notebook index") );

 
     return m_pagesData.Item(page)->GetData();
 }
 
     return m_pagesData.Item(page)->GetData();
 }


@@ -437,15 +430,13 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
     m_selection = page;
     gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
 
     m_selection = page;
     gtk_notebook_set_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);
-    }
-#endif // __WXDEBUG__
+    // gtk_notebook_set_current_page is supposed to emit the switch-page signal
+    // which should be caught by our gtk_notebook_page_change_callback which
+    // should have reset the flag to false, check it:
+    wxASSERT_LEVEL_2_MSG(
+        (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
+        "internal error in selection events generation"
+    );

 
     wxNotebookPage *client = GetPage(page);
     if ( client )
 
     wxNotebookPage *client = GetPage(page);
     if ( client )


@@ -492,7 +483,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     if (image == -1 && nb_page->m_image == -1)
         return true; /* Case 1): Nothing to do. */
 
     if (image == -1 && nb_page->m_image == -1)
         return true; /* Case 1): Nothing to do. */
 

-    GtkWidget *pixmapwid = (GtkWidget*) NULL;
+    GtkWidget *pixmapwid = NULL;

 
     if (nb_page->m_image != -1)
     {
 
     if (nb_page->m_image != -1)
     {


@@ -528,7 +519,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     /* Construct the new pixmap */
     const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
     GdkPixmap *pixmap = bmp->GetPixmap();
     /* Construct the new pixmap */
     const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
     GdkPixmap *pixmap = bmp->GetPixmap();

-    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkBitmap *mask = NULL;

     if ( bmp->GetMask() )
     {
         mask = bmp->GetMask()->GetBitmap();
     if ( bmp->GetMask() )
     {
         mask = bmp->GetMask()->GetBitmap();


@@ -598,7 +589,7 @@ bool wxNotebook::DeleteAllPages()
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );
 
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );
 

-    wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+    wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") );

 
     InvalidateBestSize();
     return wxNotebookBase::DeleteAllPages();
 
     InvalidateBestSize();
     return wxNotebookBase::DeleteAllPages();


@@ -650,7 +641,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 wxInsertChildInNotebook callback
     // why this has to be done.  NOTE: using gtk_widget_unparent here does not
 
     // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
     // why this has to be done.  NOTE: using gtk_widget_unparent here does not


@@ -696,7 +687,7 @@ bool wxNotebook::InsertPage( size_t position,
 
         const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
         GdkPixmap *pixmap = bmp->GetPixmap();
 
         const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
         GdkPixmap *pixmap = bmp->GetPixmap();

-        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkBitmap *mask = NULL;

         if ( bmp->GetMask() )
         {
             mask = bmp->GetMask()->GetBitmap();
         if ( bmp->GetMask() )
         {
             mask = bmp->GetMask()->GetBitmap();