Fix wxListCtrl background colour bug Part I

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 496c75fe5b4c737872720a0c5131f366465bce9a..f9bf5dc99949e4db3b4750f9917789d196542b7b 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -20,11 +20,11 @@
   #pragma implementation "notebook.h"
 #endif
 
   #pragma implementation "notebook.h"
 #endif
 

-#include  <wx/string.h>
-#include  <wx/log.h>
-#include  <wx/imaglist.h>
-#include  <wx/notebook.h>
-#include <wx/mac/uma.h>
+#include "wx/string.h"
+#include "wx/log.h"
+#include "wx/imaglist.h"
+#include "wx/notebook.h"
+#include "wx/mac/uma.h"

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -32,18 +32,12 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 

-#ifdef __WXMAC_X__
-  // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
-const short kwxMacTabLeftMargin = 20 ;
-const short kwxMacTabTopMargin = 38 ;
-const short kwxMacTabRightMargin = 20 ;
-const short kwxMacTabBottomMargin = 12 ;
-#else
-const short kwxMacTabLeftMargin = 16 ;
-const short kwxMacTabTopMargin = 30 ;
-const short kwxMacTabRightMargin = 16 ;
-const short kwxMacTabBottomMargin = 16 ;
-#endif
+static bool constantsSet = false ;
+
+ short kwxMacTabLeftMargin = 0 ;
+ short kwxMacTabTopMargin = 0 ;
+ short kwxMacTabRightMargin = 0 ;
+ short kwxMacTabBottomMargin = 0 ;

 
 // ----------------------------------------------------------------------------
 // event table
 
 // ----------------------------------------------------------------------------
 // event table


@@ -76,10 +70,31 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

-#ifdef __WXMAC_X__
-    m_macHorizontalBorder = 7;
-    m_macVerticalBorder = 8;
-#endif
+    if ( !constantsSet )
+    {
+        if ( UMAHasAquaLayout() )
+        {
+      // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
+            kwxMacTabLeftMargin = 20 ;
+            kwxMacTabTopMargin = 38 ;
+            kwxMacTabRightMargin = 20 ;
+            kwxMacTabBottomMargin = 12 ;
+        }
+        else
+        {
+            kwxMacTabLeftMargin = 16 ;
+            kwxMacTabTopMargin = 30 ;
+            kwxMacTabRightMargin = 16 ;
+            kwxMacTabBottomMargin = 16 ;
+        }
+        constantsSet = true ;
+    }
+    if ( UMAHasAquaLayout() )
+    {
+        m_macHorizontalBorder = 7;
+        m_macVerticalBorder = 8;
+    }
+

     m_nSelection = -1;
 }
 
     m_nSelection = -1;
 }
 


@@ -115,7 +130,7 @@ bool wxNotebook::Create(wxWindow *parent,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 

                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;


@@ -128,6 +143,41 @@ wxNotebook::~wxNotebook()
        m_macControl = NULL ;
 }
 
        m_macControl = NULL ;
 }
 

+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+{
+    wxSize sizeTotal = sizePage;
+    
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+    
+    // Mac has large notebook borders. Aqua even more so.
+
+    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
+    {
+        sizeTotal.x += 90;
+        
+        if (major >= 10)
+            sizeTotal.y += 28;
+        else
+            sizeTotal.y += 20;
+    }
+    else
+    {
+        if (major >= 10)
+        {
+            sizeTotal.x += 34;
+            sizeTotal.y += 46;
+        }
+        else
+        {
+            sizeTotal.x += 22;
+            sizeTotal.y += 44;
+        }
+    }
+
+    return sizeTotal;
+}
+

 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------


@@ -153,7 +203,7 @@ int wxNotebook::SetSelection(int nPage)
     return m_nSelection ;
 
     ChangePage(m_nSelection, nPage);
     return m_nSelection ;
 
     ChangePage(m_nSelection, nPage);

-       SetControlValue( m_macControl , m_nSelection + 1 ) ;
+       SetControlValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;

 
     return m_nSelection;
 }
 
     return m_nSelection;
 }


@@ -276,7 +326,7 @@ bool wxNotebook::InsertPage(int nPage,
  */
 void wxNotebook::MacSetupTabs()
 {
  */
 void wxNotebook::MacSetupTabs()
 {

-    SetControlMaximum( m_macControl , GetPageCount() ) ;
+    SetControlMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;

 
     wxNotebookPage *page;
     ControlTabInfoRec info;
 
     wxNotebookPage *page;
     ControlTabInfoRec info;


@@ -292,14 +342,14 @@ void wxNotebook::MacSetupTabs()
                strcpy( (char *) info.name , page->GetLabel() ) ;
                c2pstr( (char *) info.name ) ;
 #endif
                strcpy( (char *) info.name , page->GetLabel() ) ;
                c2pstr( (char *) info.name ) ;
 #endif

-        SetControlData( m_macControl, ii+1, kControlTabInfoTag,
+        SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,

                         sizeof( ControlTabInfoRec) , (char*) &info ) ;
                         sizeof( ControlTabInfoRec) , (char*) &info ) ;

-        SetControlData( m_macControl, ii+1, kControlTabEnabledFlagTag,
+        SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabEnabledFlagTag,

                         sizeof( Boolean ), (Ptr)&enabled );
     }
     Rect bounds;
                         sizeof( Boolean ), (Ptr)&enabled );
     }
     Rect bounds;

-    GetControlBounds(m_macControl, &bounds);
-    InvalWindowRect(GetMacRootWindow(), &bounds);
+    GetControlBounds((ControlHandle)m_macControl, &bounds);
+    InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -421,9 +471,9 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     m_nSelection = nSel;
 }
 
     m_nSelection = nSel;
 }
 

-void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
 {

-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(m_macControl) - 1, m_nSelection);
+  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue((ControlHandle)m_macControl) - 1, m_nSelection);

   event.SetEventObject(this);
 
   ProcessEvent(event);
   event.SetEventObject(this);
 
   ProcessEvent(event);