compilation fix after last commit (apparently patch was misapplied)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 9d90682bc0e0edda80008210f817d75217da8110..3406606bb8be9972d1dbeae8e3652a18b3e2a2d7 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -160,28 +160,32 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     return DoGetSizeFromClientSize( sizePage );
 }
 
     return DoGetSizeFromClientSize( sizePage );
 }
 

-int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
+int wxNotebook::DoSetSelection(size_t nPage, int flags)

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );
 

-    if ( int(nPage) != m_nSelection )
+    if ( m_nSelection != wxNOT_FOUND && nPage != (size_t)m_nSelection )

     {
     {

-        if (flags & SetSelection_SendEvent)
+        if ( flags & SetSelection_SendEvent )

         {
             wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
             event.SetSelection(nPage);
             event.SetOldSelection(m_nSelection);
             event.SetEventObject(this);
         {
             wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
             event.SetSelection(nPage);
             event.SetOldSelection(m_nSelection);
             event.SetEventObject(this);

-            if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+            if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )

             {
             {

-                // program allows the page change
-                event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-                (void)GetEventHandler()->ProcessEvent(event);
-
-                ChangePage(m_nSelection, nPage);
+                // vetoed by program
+                return m_nSelection;

             }
             }

+            //else: program allows the page change
+
+            event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+            (void)GetEventHandler()->ProcessEvent(event);

         }
 
         }
 

+        ChangePage(m_nSelection, nPage);
+    }
+

     return m_nSelection;
 }
 
     return m_nSelection;
 }
 


@@ -228,11 +232,6 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 
         MacSetupTabs() ;
     }
 
         MacSetupTabs() ;
     }

-        else
-        {
-            ChangePage(m_nSelection, nPage);
-        }
-    }

 
     return true;
 }
 
     return true;
 }