Replace wxTINY_CAPTION_{HORIZ,VERT} with a single wxTINY_CAPTION.

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index ac4155516dd93ba337a76eb89d7622f2012b86e5..1b821aad1e7bffc9a3ffb7e2959feec3de1b54ed 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -90,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,
-                 _T("gtk_notebook_page_change_callback reentered") );
+                 wxT("gtk_notebook_page_change_callback reentered") );
 
     notebook->m_inSwitchPage = true;
     if (g_isIdle)
@@ -230,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);
-        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 );
@@ -430,15 +430,13 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
     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 )
@@ -591,7 +589,7 @@ bool wxNotebook::DeleteAllPages()
     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();
@@ -643,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,
-                 _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