From 4ae3fe39529688ffc016b2059321720d8bde7064 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 23 Nov 2007 19:31:10 +0000 Subject: [PATCH] mac cleanup, cgcolor changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/auibook.cpp | 4 +--- src/aui/dockart.cpp | 24 ++---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 289faccafa..048229f35f 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -194,9 +194,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt() m_tab_ctrl_height = 0; #ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); + wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 34393e5315..06870399cd 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -199,9 +199,7 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) wxAuiDefaultDockArt::wxAuiDefaultDockArt() { #ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); + wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif @@ -229,15 +227,10 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() m_inactive_caption_gradient_colour = wxAuiStepColour(base_colour, 97); m_inactive_caption_text_colour = *wxBLACK; -#ifdef __WXMAC__ - m_sash_brush = toolbarbrush; - m_background_brush = toolbarbrush; - m_gripper_brush = toolbarbrush; -#else m_sash_brush = wxBrush(base_colour); m_background_brush = wxBrush(base_colour); m_gripper_brush = wxBrush(base_colour); -#endif + m_border_pen = wxPen(darker2_colour); m_gripper_pen1 = wxPen(darker5_colour); m_gripper_pen2 = wxPen(darker3_colour); @@ -419,15 +412,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height ); CGContextRef cgContext ; -#if wxMAC_USE_CORE_GRAPHICS cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext() ; -#else - Rect bounds ; - GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; - QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; - CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; - CGContextScaleCTM( cgContext , 1 , -1 ) ; -#endif HIThemeSplitterDrawInfo drawInfo ; drawInfo.version = 0 ; @@ -435,11 +420,6 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, drawInfo.adornment = kHIThemeSplitterAdornmentNone ; HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ; -#if wxMAC_USE_CORE_GRAPHICS -#else - QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; -#endif - #elif defined(__WXGTK__) // clear out the rectangle first dc.SetPen(*wxTRANSPARENT_PEN); -- 2.45.2