Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX regrouping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-29 19:50:14 +00:00
parent 26eef30437
commit 96f04e1df6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/collpaneg.cpp
View File

@@ -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 // on Mac we use the disclosure triangle
// we need a light gray line above and below, lets approximate with the frame // we need a light gray line above and below, lets approximate with the frame
m_pStaticLine = NULL; m_pStaticLine = NULL;
@@ -197,7 +197,7 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
m_pPane->Show(!collapse); m_pPane->Show(!collapse);
// update button label // update button label
#ifdef __WXMAC__ #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
m_pButton->SetOpen( !collapse ); m_pButton->SetOpen( !collapse );
#else #else
// NB: this must be done after updating our "state" // NB: this must be done after updating our "state"

2
src/generic/dirctrlg.cpp
View File

@@ -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; ItemCount volumeIndex = 1;
OSErr err = noErr ; OSErr err = noErr ;

8
src/generic/listctrl.cpp
View File

@@ -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 // if we have a native version, its implementation file does all this
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) 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; SInt32 h;
GetThemeMetric( kThemeMetricListHeaderHeight, &h ); GetThemeMetric( kThemeMetricListHeaderHeight, &h );
#else #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 // Human Interface Guidelines ask us for a special font in this case
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ) 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) if (m_headerWin)
{ {
wxFont font; wxFont font;

2
src/generic/treectlg.cpp
View File

@@ -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 ) ; m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
#else #else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );