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

adaptions to new osx ouside the main trees

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-02 17:00:30 +00:00
parent 524c47aa3a
commit 530a427a4c
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/treectlg.cpp
View File

@@ -792,8 +792,12 @@ void wxGenericTreeCtrl::Init()
m_lastOnSame = false;
#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
#if defined( __WXMAC__ )
#if wxOSX_USE_CARBON
m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
#else
m_normalFont.MacCreateFromUIFont( kCTFontViewsFontType ) ;
#endif
#else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
#endif
@@ -2295,7 +2299,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
{
int flags = wxCONTROL_SELECTED;
if (m_hasFocus
#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
&& IsControlActive( (ControlRef)GetHandle() )
#endif
)
@@ -2446,7 +2450,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
wxColour colText;
if ( item->IsSelected()
#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
// On wxMac, if the tree doesn't have the focus we draw an empty
// rectangle, so we want to make sure that the text is visible
// against the normal background, not the highlightbackground, so