Allow wxAutomationObject::GetInstance() create new instance if needed.

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 1b953423e0d5ad15fa560d2d848ecda69465f196..780ef4d3db75371b4897f2bf08665904e2ab351f 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,
     // 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)


@@ -107,7 +107,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
         // make wxNotebook::GetSelection() return the correct (i.e. consistent
         // with wxBookCtrlEvent::GetSelection()) value even though the page is
         // not really changed in GTK+
         // make wxNotebook::GetSelection() return the correct (i.e. consistent
         // with wxBookCtrlEvent::GetSelection()) value even though the page is
         // not really changed in GTK+

-        notebook->m_selection = page;
+        notebook->SetSelection(page);

     }
     else
     {
     }
     else
     {


@@ -121,7 +121,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
             // make wxNotebook::GetSelection() return the correct (i.e. consistent
             // with wxBookCtrlEvent::GetSelection()) value even though the page is
             // not really changed in GTK+
             // make wxNotebook::GetSelection() return the correct (i.e. consistent
             // with wxBookCtrlEvent::GetSelection()) value even though the page is
             // not really changed in GTK+

-            notebook->m_selection = page;
+            notebook->SetSelection(page);

 
             notebook->SendPageChangedEvent(old);
         }
 
             notebook->SendPageChangedEvent(old);
         }


@@ -227,10 +227,10 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
         int sel = notebook->GetSelection();
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
         int sel = notebook->GetSelection();

-        if (sel == -1)
+        if (sel == wxNOT_FOUND)

             return TRUE;
         wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
             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 );


@@ -292,7 +292,6 @@ void wxNotebook::Init()
     m_inSwitchPage = false;
 
     m_imageList = NULL;
     m_inSwitchPage = false;
 
     m_imageList = NULL;

-    m_selection = -1;

     m_themeEnabled = true;
 }
 
     m_themeEnabled = true;
 }
 


@@ -362,9 +361,9 @@ 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") );

 
 

-    if ( m_selection == -1 )
+    if ( m_selection == wxNOT_FOUND )

     {
         GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 
     {
         GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
 


@@ -375,8 +374,8 @@ int wxNotebook::GetSelection() const
             gpointer cur = notebook->cur_page;
             if ( cur != NULL )
             {
             gpointer cur = notebook->cur_page;
             if ( cur != NULL )
             {

-                wxConstCast(this, wxNotebook)->m_selection =
-                    g_list_index( nb_pages, cur );
+                const_cast<wxNotebook *>(this)->
+                    SetSelection(g_list_index( nb_pages, cur ));

             }
         }
     }
             }
         }
     }


@@ -417,7 +416,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( m_widget != NULL, -1, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );

 
     wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
 
 
     wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
 


@@ -433,7 +432,7 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
     // 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:
     // 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(
+    wxASSERT_LEVEL_2_MSG(

         (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
         "internal error in selection events generation"
     );
         (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
         "internal error in selection events generation"
     );


@@ -589,7 +588,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();


@@ -597,10 +596,10 @@ bool wxNotebook::DeleteAllPages()
 
 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
 
 wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {

-    if ( m_selection != -1 && (size_t)m_selection >= page )
+    if ( m_selection != wxNOT_FOUND && (size_t)m_selection >= page )

     {
         // the index will become invalid after the page is deleted
     {
         // the index will become invalid after the page is deleted

-        m_selection = -1;
+        m_selection = wxNOT_FOUND;

     }
 
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     }
 
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);


@@ -641,7 +640,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