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@54816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-29 19:51:37 +00:00
parent 96f04e1df6
commit efdea9c39e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/aui/auibook.cpp
View File

@@ -34,7 +34,7 @@
#include "wx/renderer.h" #include "wx/renderer.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#include "wx/osx/carbon/private.h" #include "wx/osx/private.h"
#endif #endif
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
@@ -193,7 +193,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
m_fixed_tab_width = 100; m_fixed_tab_width = 100;
m_tab_ctrl_height = 0; m_tab_ctrl_height = 0;
#ifdef __WXMAC__ #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
#else #else
wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

6
src/aui/dockart.cpp
View File

@@ -198,7 +198,7 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size)
wxAuiDefaultDockArt::wxAuiDefaultDockArt() wxAuiDefaultDockArt::wxAuiDefaultDockArt()
{ {
#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__) #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
#else #else
wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
@@ -310,7 +310,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour);
// default metric values // default metric values
#if defined(__WXMAC__) #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
SInt32 height; SInt32 height;
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height );
m_sash_size = height; m_sash_size = height;
@@ -413,7 +413,7 @@ wxFont wxAuiDefaultDockArt::GetFont(int id)
void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, const wxRect& rect) void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, const wxRect& rect)
{ {
#if defined(__WXMAC__) #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
wxUnusedVar(window); wxUnusedVar(window);
wxUnusedVar(orientation); wxUnusedVar(orientation);