check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 26decfafb24c22c97052d55631b757573e19504f..746e0464f3a5ec69554eb391a00ddb716e135873 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -17,13 +17,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/app.h"

 #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/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 
 


@@ -80,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;
 


@@ -102,10 +105,7 @@ bool wxNotebook::Create( wxWindow *parent,
     switch (GetWindowVariant())
     {
         case wxWINDOW_VARIANT_MINI:
     switch (GetWindowVariant())
     {
         case wxWINDOW_VARIANT_MINI:

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

             break;
 
         case wxWINDOW_VARIANT_SMALL:
             break;
 
         case wxWINDOW_VARIANT_SMALL:


@@ -137,12 +137,12 @@ wxNotebook::~wxNotebook()
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 

-void wxNotebook::SetPadding(const wxSize& padding)
+void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding))

 {
     // unsupported by OS
 }
 
 {
     // unsupported by OS
 }
 

-void wxNotebook::SetTabSize(const wxSize& sz)
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))

 {
     // unsupported by OS
 }
 {
     // unsupported by OS
 }


@@ -157,25 +157,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;
 }


@@ -324,7 +326,6 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
 {
     int resultV = wxNOT_FOUND;
 
 {
     int resultV = wxNOT_FOUND;
 

-#if TARGET_API_MAC_OSX

     const int countPages = GetPageCount();
 
     // we have to convert from Client to Window relative coordinates
     const int countPages = GetPageCount();
 
     // we have to convert from Client to Window relative coordinates


@@ -365,7 +366,6 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
 
     if ( outPart >= 1 && outPart <= countPages )
         resultV = outPart - 1 ;
 
     if ( outPart >= 1 && outPart <= countPages )
         resultV = outPart - 1 ;

-#endif // TARGET_API_MAC_OSX

 
     if (flags != NULL)
     {
 
     if (flags != NULL)
     {


@@ -373,9 +373,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;


@@ -403,7 +403,7 @@ void wxNotebook::MacSetupTabs()
         info.name = cflabel ;
         m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
 
         info.name = cflabel ;
         m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
 

-        if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
+        if ( GetImageList() && GetPageImage(ii) >= 0 )

         {
             const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ;
             if ( bmap.Ok() )
         {
             const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ;
             if ( bmap.Ok() )


@@ -422,9 +422,7 @@ void wxNotebook::MacSetupTabs()
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 

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

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


@@ -511,7 +509,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
                 event.SetEventObject( this );
 
                 wxWindow *page = m_pages[m_nSelection];
                 event.SetEventObject( this );
 
                 wxWindow *page = m_pages[m_nSelection];

-                if ( !page->GetEventHandler()->ProcessEvent( event ) )
+                if ( !page->HandleWindowEvent( event ) )

                 {
                     page->SetFocus();
                 }
                 {
                     page->SetFocus();
                 }


@@ -529,7 +527,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
             if ( parent )
             {
                 event.SetCurrentFocus( this );
             if ( parent )
             {
                 event.SetCurrentFocus( this );

-                parent->GetEventHandler()->ProcessEvent( event );
+                parent->HandleWindowEvent( event );

             }
         }
     }
             }
         }
     }


@@ -556,7 +554,7 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 
 #endif // wxUSE_CONSTRAINTS
 
 
 #endif // wxUSE_CONSTRAINTS
 

-void wxNotebook::Command(wxCommandEvent& event)
+void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))

 {
     wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));
 }
 {
     wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));
 }


@@ -596,7 +594,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
             newSel , m_nSelection );
         changing.SetEventObject( this );
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
             newSel , m_nSelection );
         changing.SetEventObject( this );

-        GetEventHandler()->ProcessEvent( changing );
+        HandleWindowEvent( changing );

 
         if ( changing.IsAllowed() )
         {
 
         if ( changing.IsAllowed() )
         {


@@ -604,7 +602,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
                 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
                 newSel, m_nSelection );
             event.SetEventObject( this );
                 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
                 newSel, m_nSelection );
             event.SetEventObject( this );

-            GetEventHandler()->ProcessEvent( event );
+            HandleWindowEvent( event );

         }
         else
         {
         }
         else
         {