cleanup:

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 1e6e98a2393f69928b50cc976d169496ad946995..2aff7f536bec91cc4097873e4528be3dc9828217 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -13,12 +13,17 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

-#include "wx/app.h"
+#include "wx/notebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/image.h"
+#endif
+

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/image.h"
-#include "wx/notebook.h"

 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 
 


@@ -75,6 +80,9 @@ bool wxNotebook::Create( wxWindow *parent,
 {
     m_macIsUserPane = false ;
 
 {
     m_macIsUserPane = false ;
 

+    if (! (style & wxBK_ALIGN_MASK))
+        style |= wxBK_TOP;
+

     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 
     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 


@@ -96,18 +104,18 @@ bool wxNotebook::Create( wxWindow *parent,
     ControlTabSize tabsize;
     switch (GetWindowVariant())
     {
     ControlTabSize tabsize;
     switch (GetWindowVariant())
     {

-       case wxWINDOW_VARIANT_MINI:
+        case wxWINDOW_VARIANT_MINI:

             if ( UMAGetSystemVersion() >= 0x1030 )
                 tabsize = 3 ;
             else
                 tabsize = kControlSizeSmall;
             break;
 
             if ( UMAGetSystemVersion() >= 0x1030 )
                 tabsize = 3 ;
             else
                 tabsize = kControlSizeSmall;
             break;
 

-       case wxWINDOW_VARIANT_SMALL:
+        case wxWINDOW_VARIANT_SMALL:

             tabsize = kControlTabSizeSmall;
             break;
 
             tabsize = kControlTabSizeSmall;
             break;
 

-       default:
+        default:

             tabsize = kControlTabSizeLarge;
             break;
     }
             tabsize = kControlTabSizeLarge;
             break;
     }


@@ -152,25 +160,27 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     return DoGetSizeFromClientSize( sizePage );
 }
 
     return DoGetSizeFromClientSize( sizePage );
 }
 

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

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("SetSelection: 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 )

     {
     {

-        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 ( flags & SetSelection_SendEvent )

         {
         {

-            // program allows the page change
-            event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
+            if ( !SendPageChangingEvent(nPage) )
+            {
+                // vetoed by program
+                return m_nSelection;
+            }
+            //else: program allows the page change

 
 

-            ChangePage(m_nSelection, nPage);
+            SendPageChangedEvent(m_nSelection, nPage);

         }
         }

+
+        ChangePage(m_nSelection, nPage);

     }
     }

+    //else: no change

 
     return m_nSelection;
 }
 
     return m_nSelection;
 }


@@ -322,7 +332,13 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
 #if TARGET_API_MAC_OSX
     const int countPages = GetPageCount();
 
 #if TARGET_API_MAC_OSX
     const int countPages = GetPageCount();
 

-    HIPoint hipoint = { pt.x , pt.y } ;
+    // we have to convert from Client to Window relative coordinates
+    wxPoint adjustedPt = pt + GetClientAreaOrigin();
+    // and now to HIView native ones
+    adjustedPt.x -= MacGetLeftBorderSize() ;
+    adjustedPt.y -= MacGetTopBorderSize() ;
+
+    HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;

     HIViewPartCode outPart = 0 ;
     OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
 
     HIViewPartCode outPart = 0 ;
     OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
 


@@ -362,9 +378,9 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
 
         // we cannot differentiate better
         if (resultV >= 0)
 
         // we cannot differentiate better
         if (resultV >= 0)

-            *flags |= wxNB_HITTEST_ONLABEL;
+            *flags |= wxBK_HITTEST_ONLABEL;

         else
         else

-            *flags |= wxNB_HITTEST_NOWHERE;
+            *flags |= wxBK_HITTEST_NOWHERE;

     }
 
     return resultV;
     }
 
     return resultV;


@@ -411,9 +427,13 @@ void wxNotebook::MacSetupTabs()
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 

+#if wxMAC_USE_CORE_GRAPHICS
+    Refresh();
+#else

     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;
     InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds );
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;
     InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds );

+#endif

 }
 
 wxRect wxNotebook::GetPageRect() const
 }
 
 wxRect wxNotebook::GetPageRect() const