cleanup, fixing exports

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 6daf1bd791f5964852ef26a4ab303f1afb110416..bbdff77f029ccdde27d382762f31f5ab851b0cbe 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -105,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:


@@ -140,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
 }


@@ -164,7 +161,7 @@ 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 ( m_nSelection != wxNOT_FOUND && nPage != (size_t)m_nSelection )
+    if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )

     {
         if ( flags & SetSelection_SendEvent )
         {
     {
         if ( flags & SetSelection_SendEvent )
         {


@@ -180,6 +177,7 @@ int wxNotebook::DoSetSelection(size_t nPage, int flags)
 
         ChangePage(m_nSelection, nPage);
     }
 
         ChangePage(m_nSelection, nPage);
     }

+    //else: no change

 
     return m_nSelection;
 }
 
     return m_nSelection;
 }


@@ -328,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


@@ -369,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)
     {


@@ -407,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() )


@@ -426,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


@@ -560,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"));
 }