Adapted those asserts and debug messages for Unicode.

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index ea57e8c4338a1137c224680f52c3dc19fc1faece..5afa688185d63e00f5cff4b5877f53c67ec620e2 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -177,7 +177,7 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
 
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
       GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
 

-    wxASSERT_MSG( page->m_page, "Notebook page creation error" );
+    wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );

 
     parent->m_pages.Append( page );
 }
 
     parent->m_pages.Append( page );
 }


@@ -233,10 +233,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_notebook_new();
 
 
     m_widget = gtk_notebook_new();
 

-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, "wxNotebook::m_widget", name );
-#endif
-

     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     m_idHandler = gtk_signal_connect (
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
     m_idHandler = gtk_signal_connect (


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

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

 
     if (m_pages.Number() == 0) return -1;
 
 
     if (m_pages.Number() == 0) return -1;
 


@@ -285,7 +281,7 @@ int wxNotebook::GetSelection() const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
+    wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") );

 
     return page->m_id;
 }
 
     return page->m_id;
 }


@@ -314,7 +310,7 @@ int wxNotebook::GetRowCount() const
 
 wxString wxNotebook::GetPageText( int page ) const
 {
 
 wxString wxNotebook::GetPageText( int page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") );

 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)


@@ -325,7 +321,7 @@ wxString wxNotebook::GetPageText( int page ) const
 
 int wxNotebook::GetPageImage( int page ) const
 {
 
 int wxNotebook::GetPageImage( int page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") );

 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (nb_page)


@@ -336,7 +332,7 @@ int wxNotebook::GetPageImage( int page ) const
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {

-    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") );

 
     wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 
 
     wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
 


@@ -349,14 +345,14 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    wxFAIL_MSG( "Notebook page not found!" );
+    wxFAIL_MSG( _T("Notebook page not found!") );

 
     return (wxNotebookPage *) NULL;
 }
 
 int wxNotebook::SetSelection( int page )
 {
 
     return (wxNotebookPage *) NULL;
 }
 
 int wxNotebook::SetSelection( int page )
 {

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

 
     int selOld = GetSelection();
     wxNotebookPage* nb_page = GetNotebookPage(page);
 
     int selOld = GetSelection();
     wxNotebookPage* nb_page = GetNotebookPage(page);


@@ -381,7 +377,7 @@ int wxNotebook::SetSelection( int page )
 
 void wxNotebook::AdvanceSelection( bool bForward )
 {
 
 void wxNotebook::AdvanceSelection( bool bForward )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid notebook") );

 
     int sel = GetSelection();
     int max = GetPageCount();
 
     int sel = GetSelection();
     int max = GetPageCount();


@@ -399,7 +395,7 @@ void wxNotebook::SetImageList( wxImageList* imageList )
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );

 
     wxNotebookPage* nb_page = GetNotebookPage(page);
 
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
 


@@ -407,9 +403,9 @@ bool wxNotebook::SetPageText( int page, const wxString &text )
 
     nb_page->m_text = text;
 
 
     nb_page->m_text = text;
 

-    if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
+    if (nb_page->m_text.IsEmpty()) nb_page->m_text = _T("");

  
  

-    gtk_label_set(nb_page->m_label, nb_page->m_text);
+    gtk_label_set(nb_page->m_label, nb_page->m_text.mbc_str());

    
     return TRUE;
 }
    
     return TRUE;
 }


@@ -501,22 +497,22 @@ bool wxNotebook::SetPageImage( int page, int image )
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {

-    wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") );

 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
 }
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {

-    wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") );

 }
 
 void wxNotebook::SetTabSize(const wxSize& sz)
 {
 }
 
 void wxNotebook::SetTabSize(const wxSize& sz)
 {

-    wxFAIL_MSG( "wxNotebook::SetTabSize not implemented" );
+    wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") );

 }
 
 bool wxNotebook::DeleteAllPages()
 {
 }
 
 bool wxNotebook::DeleteAllPages()
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );

 
     wxNode *page_node = m_pages.First();
     while (page_node)
 
     wxNode *page_node = m_pages.First();
     while (page_node)


@@ -545,7 +541,7 @@ bool wxNotebook::DeletePage( int page )
         child = child->next;
     }
 
         child = child->next;
     }
 

-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );

 
     delete nb_page->m_client;
 
 
     delete nb_page->m_client;
 


@@ -568,7 +564,7 @@ bool wxNotebook::RemovePage( int page )
         child = child->next;
     }
 
         child = child->next;
     }
 

-    wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
+    wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );

 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 
 
     gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
 


@@ -580,7 +576,7 @@ bool wxNotebook::RemovePage( int page )
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool select, int imageId)
 {
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool select, int imageId)
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );

 
     /* we've created the notebook page in AddChild(). Now we just have to set
        the caption for the page and set the others parameters. */
 
     /* we've created the notebook page in AddChild(). Now we just have to set
        the caption for the page and set the others parameters. */


@@ -596,10 +592,10 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
     }
 
     wxCHECK_MSG( page != NULL, FALSE,
     }
 
     wxCHECK_MSG( page != NULL, FALSE,

-               "Can't add a page whose parent is not the notebook!" );
+               _T("Can't add a page whose parent is not the notebook!") );

 
     wxCHECK_MSG( page->Add(), FALSE,
 
     wxCHECK_MSG( page->Add(), FALSE,

-               "Can't add the same page twice to a notebook." );
+               _T("Can't add the same page twice to a notebook.") );

 
     if (imageId != -1)
     {
 
     if (imageId != -1)
     {


@@ -622,9 +618,9 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
 
     /* then set the attributes */
     page->m_text = text;
 
     /* then set the attributes */
     page->m_text = text;

-    if (page->m_text.IsEmpty()) page->m_text = "";
+    if (page->m_text.IsEmpty()) page->m_text = _T("");

     page->m_image = imageId;
     page->m_image = imageId;

-    page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
+    page->m_label = (GtkLabel *)gtk_label_new(page->m_text.mbc_str());

     gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
 
     /* @@@: what does this do? do we still need it?
     gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
 
     /* @@@: what does this do? do we still need it?


@@ -647,7 +643,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {

-    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+    wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") );

 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (!nb_page)
 
     wxNotebookPage* nb_page = GetNotebookPage(page);
     if (!nb_page)