Ensure item is valid before using it.

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

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index 0f0339aa14acac691e45ae49afd1ac8816522aaa..59818d3529fea37391b2dbe2164a5166be1f8c55 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -16,7 +16,10 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
 
 // wxWindows
 #ifndef WX_PRECOMP

-  #include  "wx/string.h"
+  #include "wx/app.h"
+  #include "wx/dcclient.h"
+  #include "wx/string.h"
+  #include "wx/settings.h"

 #endif  // WX_PRECOMP
 
 #include  "wx/log.h"
 #endif  // WX_PRECOMP
 
 #include  "wx/log.h"


@@ -184,7 +187,7 @@ WXDWORD wxNotebook::OS2GetStyle (
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 

-int wxNotebook::GetPageCount() const
+size_t wxNotebook::GetPageCount() const

 {
     int                             nPageInternal = m_pages.Count();
     int                             nPageAPI = (int)::WinSendMsg(GetHWND(), BKM_QUERYPAGECOUNT, (MPARAM)0, (MPARAM)BKA_END);
 {
     int                             nPageInternal = m_pages.Count();
     int                             nPageAPI = (int)::WinSendMsg(GetHWND(), BKM_QUERYPAGECOUNT, (MPARAM)0, (MPARAM)BKA_END);


@@ -206,29 +209,44 @@ int wxNotebook::GetRowCount() const
 } // end of wxNotebook::GetRowCount
 
 int wxNotebook::SetSelection(
 } // end of wxNotebook::GetRowCount
 
 int wxNotebook::SetSelection(

-  int                               nPage
+  size_t                            nPage

 )
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
 )
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );

-    int                             nOldPage = GetSelection();

 
 

-    ChangePage( m_nSelection
-               ,nPage
-              );
+    if (nPage != m_nSelection)
+    {
+        wxNotebookEvent             vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+                                           ,m_windowId
+                                          );

 
 

-    ULONG                           ulPageId = (ULONG)m_alPageId[nPage];
+        vEvent.SetSelection(nPage);
+        vEvent.SetOldSelection(m_nSelection);
+        vEvent.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(vEvent) || vEvent.IsAllowed())
+        {

 
 

-    ::WinSendMsg( GetHWND()
-                 ,BKM_TURNTOPAGE
-                 ,MPFROMLONG((ULONG)m_alPageId[nPage])
-                 ,(MPARAM)0
-                );
+            //
+            // Program allows the page change
+            //
+            vEvent.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+            GetEventHandler()->ProcessEvent(vEvent);
+
+            ULONG                   ulPageId = (ULONG)m_alPageId[nPage];
+
+            ::WinSendMsg( GetHWND()
+                         ,BKM_TURNTOPAGE
+                         ,MPFROMLONG((ULONG)m_alPageId[nPage])
+                         ,(MPARAM)0
+                        );
+        }
+    }

     m_nSelection = nPage;
     return nPage;
 } // end of wxNotebook::SetSelection
 
 bool wxNotebook::SetPageText(
     m_nSelection = nPage;
     return nPage;
 } // end of wxNotebook::SetSelection
 
 bool wxNotebook::SetPageText(

-  int                               nPage
+  size_t                            nPage

 , const wxString&                   rsStrText
 )
 {
 , const wxString&                   rsStrText
 )
 {


@@ -245,7 +263,7 @@ bool wxNotebook::SetPageText(
 } // end of wxNotebook::SetPageText
 
 wxString wxNotebook::GetPageText (
 } // end of wxNotebook::SetPageText
 
 wxString wxNotebook::GetPageText (

-  int                               nPage
+  size_t                            nPage

 ) const
 {
     BOOKTEXT                        vBookText;
 ) const
 {
     BOOKTEXT                        vBookText;


@@ -297,7 +315,7 @@ wxString wxNotebook::GetPageText (
 } // end of wxNotebook::GetPageText
 
 int wxNotebook::GetPageImage (
 } // end of wxNotebook::GetPageText
 
 int wxNotebook::GetPageImage (

-  int                               nPage
+  size_t                            nPage

 ) const
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
 ) const
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );


@@ -309,7 +327,7 @@ int wxNotebook::GetPageImage (
 } // end of wxNotebook::GetPageImage
 
 bool wxNotebook::SetPageImage (
 } // end of wxNotebook::GetPageImage
 
 bool wxNotebook::SetPageImage (

-  int                               nPage
+  size_t                            nPage

 , int                               nImage
 )
 {
 , int                               nImage
 )
 {


@@ -389,7 +407,7 @@ void wxNotebook::SetTabSize (
 // Remove one page from the notebook, without deleting
 //
 wxNotebookPage* wxNotebook::DoRemovePage (
 // Remove one page from the notebook, without deleting
 //
 wxNotebookPage* wxNotebook::DoRemovePage (

-  int                               nPage
+  size_t                            nPage

 )
 {
     wxNotebookPage*                 pPageRemoved = wxNotebookBase::DoRemovePage(nPage);
 )
 {
     wxNotebookPage*                 pPageRemoved = wxNotebookBase::DoRemovePage(nPage);


@@ -501,7 +519,7 @@ bool wxNotebook::AddPage (
 // Same as AddPage() but does it at given position
 //
 bool wxNotebook::InsertPage (
 // Same as AddPage() but does it at given position
 //
 bool wxNotebook::InsertPage (

-  int                               nPage
+  size_t                            nPage

 , wxNotebookPage*                   pPage
 , const wxString&                   rsStrText
 , bool                              bSelect
 , wxNotebookPage*                   pPage
 , const wxString&                   rsStrText
 , bool                              bSelect


@@ -889,56 +907,5 @@ bool wxNotebook::OS2OnScroll (
                                       );
 } // end of wxNotebook::OS2OnScroll
 
                                       );
 } // end of wxNotebook::OS2OnScroll
 

-// ----------------------------------------------------------------------------
-// wxNotebook helper functions
-// ----------------------------------------------------------------------------
-
-//
-// Generate the page changing and changed events, hide the currently active
-// panel and show the new one
-//
-void wxNotebook::ChangePage (
-  int                               nOldSel
-, int                               nSel
-)
-{
-    static bool                     sbInsideChangePage = FALSE;
-
-    //
-    // When we call ProcessEvent(), our own OnSelChange() is called which calls
-    // this function - break the infinite loop
-    //
-    if (sbInsideChangePage)
-        return;
-
-    //
-    // It's not an error (the message may be generated by the tab control itself)
-    // and it may happen - just do nothing
-    //
-    if (nSel == nOldSel)
-        return;
-
-    sbInsideChangePage = TRUE;
-
-    wxNotebookEvent                 rEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
-                                           ,m_windowId
-                                          );
-
-    rEvent.SetSelection(nSel);
-    rEvent.SetOldSelection(nOldSel);
-    rEvent.SetEventObject(this);
-    if (GetEventHandler()->ProcessEvent(rEvent) && !rEvent.IsAllowed())
-    {
-        //
-        // Program doesn't allow the page change
-        //
-        sbInsideChangePage = FALSE;
-        return;
-    }
-    rEvent.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-    GetEventHandler()->ProcessEvent(rEvent);
-    sbInsideChangePage = FALSE;
-} // end of wxNotebook::ChangePage
-

 #endif // wxUSE_NOTEBOOK
 
 #endif // wxUSE_NOTEBOOK