OSX regrouping

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index d347294f26706885465064dc97ffe20e7e7c67c4..df93ce72aefc2bf264579f4e77d863f43def3d91 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -82,7 +82,7 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
 
     m_strLabel = label;
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

     // on Mac we use the disclosure triangle
     // we need a light gray line above and below, lets approximate with the frame
     m_pStaticLine = NULL;
     // on Mac we use the disclosure triangle
     // we need a light gray line above and below, lets approximate with the frame
     m_pStaticLine = NULL;


@@ -197,7 +197,7 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     m_pPane->Show(!collapse);
 
     // update button label
     m_pPane->Show(!collapse);
 
     // update button label

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

     m_pButton->SetOpen( !collapse );
 #else
     // NB: this must be done after updating our "state"
     m_pButton->SetOpen( !collapse );
 #else
     // NB: this must be done after updating our "state"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 78e5a7f7c2819cf323bfe06eefb4407ca11dae01..f75a5979885bd8bc3deec8a168b58e3b1ad989ef 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -219,7 +219,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
     }
 #endif // __WIN32__/!__WIN32__
 
     }
 #endif // __WIN32__/!__WIN32__
 

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON

 
     ItemCount volumeIndex = 1;
     OSErr err = noErr ;
 
     ItemCount volumeIndex = 1;
     OSErr err = noErr ;

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 8c1d0a4f2a0afe9d490a79a76e8776fde06ff444..60540ba6b73c536261c484703b4cf59d0e65a461 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/listctrl.h"
 
 
 #include "wx/listctrl.h"
 

-#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
+#if ((!defined(__WXMSW__) && !defined(__WXMAC__)) || defined(__WXUNIVERSAL__))

     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)


@@ -4964,7 +4964,7 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
 {
     if ( m_headerWin )
     {
 {
     if ( m_headerWin )
     {

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON

         SInt32 h;
         GetThemeMetric( kThemeMetricListHeaderHeight, &h );
 #else
         SInt32 h;
         GetThemeMetric( kThemeMetricListHeaderHeight, &h );
 #else


@@ -5035,7 +5035,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON

     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {


@@ -5049,7 +5049,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     {
         CreateHeaderWindow();
 
     {
         CreateHeaderWindow();
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON

         if (m_headerWin)
         {
             wxFont font;
         if (m_headerWin)
         {
             wxFont font;

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 53c95a2aad20e004bf89b74b4e3124519081b6fd..b9f5f2cf1674fece3ee3abd9fd93f8744399f5f3 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -792,7 +792,7 @@ void wxGenericTreeCtrl::Init()
 
     m_lastOnSame = false;
 
 
     m_lastOnSame = false;
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON

     m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
     m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );