always return wxString from wxGetUserHome() instead of char */wxWCharBuffer depending...

[wxWidgets.git] / src / mac / carbon / notebmac.cpp

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 9d90682bc0e0edda80008210f817d75217da8110..2aff7f536bec91cc4097873e4528be3dc9828217 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -160,28 +160,28 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     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") );
 
-    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);
-            if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+            if ( !SendPageChangingEvent(nPage) )
             {
-                // 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
+
+            SendPageChangedEvent(m_nSelection, nPage);
         }
 
+        ChangePage(m_nSelection, nPage);
+    }
+    //else: no change
+
     return m_nSelection;
 }
 
@@ -228,11 +228,6 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 
         MacSetupTabs() ;
     }
-        else
-        {
-            ChangePage(m_nSelection, nPage);
-        }
-    }
 
     return true;
 }
@@ -432,9 +427,13 @@ void wxNotebook::MacSetupTabs()
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 
+#if wxMAC_USE_CORE_GRAPHICS
+    Refresh();
+#else
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;
     InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds );
+#endif
 }
 
 wxRect wxNotebook::GetPageRect() const