X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50d5ad7d77681d4e6e9a7cc5d459ea6896459d78..3013861102292eb82391e361bee1dc090783c653:/src/aui/dockart.cpp diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 248f63b8a5..3d9675b2ba 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -35,13 +35,13 @@ #endif #ifdef __WXMAC__ -#include "wx/mac/private.h" +#include "wx/osx/private.h" #include "wx/graphics.h" +#include "wx/dcgraph.h" #endif #ifdef __WXGTK__ #include -#include "wx/gtk/win_gtk.h" #include "wx/renderer.h" #endif @@ -54,19 +54,7 @@ // with custom dock art (probably by writing a new stand-alone class derived // from the wxAuiDockArt base class). The active dock art class can be set via // wxAuiManager::SetDockArt() - - -// StepColour() it a utility function that simply darkens -// or lightens a color, based on the specified percentage -static wxColor StepColour(const wxColor& c, int percent) -{ - int r = c.Red(), g = c.Green(), b = c.Blue(); - return wxColour((unsigned char)wxMin((r*percent)/100,255), - (unsigned char)wxMin((g*percent)/100,255), - (unsigned char)wxMin((b*percent)/100,255)); -} - -static wxColor LightContrastColour(const wxColour& c) +wxColor wxAuiLightContrastColour(const wxColour& c) { int amount = 120; @@ -75,13 +63,13 @@ static wxColor LightContrastColour(const wxColour& c) if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128) amount = 160; - return StepColour(c, amount); + return c.ChangeLightness(amount); } -// BitmapFromBits() is a utility function that creates a +// wxAuiBitmapFromBits() is a utility function that creates a // masked bitmap from raw bits (XBM format) -static wxBitmap BitmapFromBits(const unsigned char bits[], int w, int h, - const wxColour& color) +wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, + const wxColour& color) { wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage(); img.Replace(0,0,0,123,123,123); @@ -104,17 +92,17 @@ static void DrawGradientRectangle(wxDC& dc, if (direction == wxAUI_GRADIENT_VERTICAL) high = rect.GetHeight()-1; - else + else high = rect.GetWidth()-1; for (int i = 0; i <= high; ++i) { int r,g,b; - - - r = start_color.Red() + ((i*rd*100)/high)/100; - g = start_color.Green() + ((i*gd*100)/high)/100; - b = start_color.Blue() + ((i*bd*100)/high)/100; + + + r = start_color.Red() + (high <= 0 ? 0 : (((i*rd*100)/high)/100)); + g = start_color.Green() + (high <= 0 ? 0 : (((i*gd*100)/high)/100)); + b = start_color.Blue() + (high <= 0 ? 0 : (((i*bd*100)/high)/100)); wxPen p(wxColor((unsigned char)r, (unsigned char)g, @@ -123,32 +111,31 @@ static void DrawGradientRectangle(wxDC& dc, if (direction == wxAUI_GRADIENT_VERTICAL) dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i); - else + else dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height); } - } -static wxString ChopText(wxDC& dc, const wxString& text, int max_size) +wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) { wxCoord x,y; - + // first check if the text fits with no problems dc.GetTextExtent(text, &x, &y); if (x <= max_size) return text; - + size_t i, len = text.Length(); size_t last_good_length = 0; for (i = 0; i < len; ++i) { wxString s = text.Left(i); s += wxT("..."); - + dc.GetTextExtent(s, &x, &y); if (x > max_size) break; - + last_good_length = i; } @@ -159,37 +146,39 @@ static wxString ChopText(wxDC& dc, const wxString& text, int max_size) wxAuiDefaultDockArt::wxAuiDefaultDockArt() { -#ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON + wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif + // the base_colour is too pale to use as our base colour, + // so darken it a bit -- + if ((255-base_colour.Red()) + + (255-base_colour.Green()) + + (255-base_colour.Blue()) < 60) + { + base_colour = base_colour.ChangeLightness(92); + } + m_base_colour = base_colour; - wxColor darker1_colour = StepColour(base_colour, 85); - wxColor darker2_colour = StepColour(base_colour, 70); - wxColor darker3_colour = StepColour(base_colour, 60); - wxColor darker4_colour = StepColour(base_colour, 50); - wxColor darker5_colour = StepColour(base_colour, 40); + wxColor darker1_colour = base_colour.ChangeLightness(85); + wxColor darker2_colour = base_colour.ChangeLightness(75); + wxColor darker3_colour = base_colour.ChangeLightness(60); + //wxColor darker4_colour = base_colour.ChangeLightness(50); + wxColor darker5_colour = base_colour.ChangeLightness(40); m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_active_caption_gradient_colour = LightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); + m_active_caption_gradient_colour = wxAuiLightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); m_active_caption_text_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_inactive_caption_colour = darker1_colour; - m_inactive_caption_gradient_colour = StepColour(base_colour, 97); + m_inactive_caption_gradient_colour = base_colour.ChangeLightness(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); @@ -201,88 +190,106 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); #endif + // default metric values +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON + SInt32 height; + GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); + m_sash_size = height; +#elif defined(__WXGTK__) + m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash; +#else + m_sash_size = 4; +#endif + m_caption_size = 17; + m_border_size = 1; + m_button_size = 14; + m_gripper_size = 9; + m_gradient_type = wxAUI_GRADIENT_VERTICAL; + + InitBitmaps(); +} + +void +wxAuiDefaultDockArt::InitBitmaps () +{ // some built in bitmaps #if defined( __WXMAC__ ) - static unsigned char close_bits[]={ + static const unsigned char close_bits[]={ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3, 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3, 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF }; +#elif defined(__WXGTK__) + static const unsigned char close_bits[]={ + 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, + 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, + 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; #else - static unsigned char close_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9, - 0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char close_bits[]={ + // reduced height, symmetric + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x9f, 0xf9, + 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + /* + // same height as maximize/restore + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xf3, 0x9f, 0xf9, + 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xe7, 0xe7, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + */ #endif - static unsigned char maximize_bits[] = { + static const unsigned char maximize_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xf7, 0xf7, 0x07, 0xf0, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - static unsigned char restore_bits[]={ + static const unsigned char restore_bits[]={ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xf0, 0x1f, 0xf0, 0xdf, 0xf7, 0x07, 0xf4, 0x07, 0xf4, 0xf7, 0xf5, 0xf7, 0xf1, 0xf7, 0xfd, 0xf7, 0xfd, 0x07, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - - static unsigned char pin_bits[]={ + + static const unsigned char pin_bits[]={ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc, 0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff, 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; #ifdef __WXMAC__ - m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE); - m_active_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE ); + m_inactive_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE); + m_active_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE ); #else - m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, m_inactive_caption_text_colour); - m_active_close_bitmap = BitmapFromBits(close_bits, 16, 16, m_active_caption_text_colour); + m_inactive_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_inactive_caption_text_colour); + m_active_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_active_caption_text_colour); #endif #ifdef __WXMAC__ - m_inactive_maximize_bitmap = BitmapFromBits(maximize_bits, 16, 16, *wxWHITE); - m_active_maximize_bitmap = BitmapFromBits(maximize_bits, 16, 16, *wxWHITE ); + m_inactive_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE); + m_active_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE ); #else - m_inactive_maximize_bitmap = BitmapFromBits(maximize_bits, 16, 16, m_inactive_caption_text_colour); - m_active_maximize_bitmap = BitmapFromBits(maximize_bits, 16, 16, m_active_caption_text_colour); + m_inactive_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_inactive_caption_text_colour); + m_active_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_active_caption_text_colour); #endif #ifdef __WXMAC__ - m_inactive_restore_bitmap = BitmapFromBits(restore_bits, 16, 16, *wxWHITE); - m_active_restore_bitmap = BitmapFromBits(restore_bits, 16, 16, *wxWHITE ); + m_inactive_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE); + m_active_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE ); #else - m_inactive_restore_bitmap = BitmapFromBits(restore_bits, 16, 16, m_inactive_caption_text_colour); - m_active_restore_bitmap = BitmapFromBits(restore_bits, 16, 16, m_active_caption_text_colour); + m_inactive_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_inactive_caption_text_colour); + m_active_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_active_caption_text_colour); #endif - m_inactive_pin_bitmap = BitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour); - m_active_pin_bitmap = BitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); - - // default metric values -#if defined(__WXMAC__) - SInt32 height; - GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); - m_sash_size = height; -#elif defined(__WXGTK__) - m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash; -#else - m_sash_size = 4; -#endif - m_caption_size = 17; - m_border_size = 1; - m_button_size = 14; - m_gripper_size = 9; - m_gradient_type = wxAUI_GRADIENT_VERTICAL; + m_inactive_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour); + m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); } int wxAuiDefaultDockArt::GetMetric(int id) { switch (id) { - case wxAUI_ART_SASH_SIZE: return m_sash_size; - case wxAUI_ART_CAPTION_SIZE: return m_caption_size; - case wxAUI_ART_GRIPPER_SIZE: return m_gripper_size; - case wxAUI_ART_PANE_BORDER_SIZE: return m_border_size; - case wxAUI_ART_PANE_BUTTON_SIZE: return m_button_size; - case wxAUI_ART_GRADIENT_TYPE: return m_gradient_type; + case wxAUI_DOCKART_SASH_SIZE: return m_sash_size; + case wxAUI_DOCKART_CAPTION_SIZE: return m_caption_size; + case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripper_size; + case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_border_size; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_button_size; + case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradient_type; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -293,12 +300,12 @@ void wxAuiDefaultDockArt::SetMetric(int id, int new_val) { switch (id) { - case wxAUI_ART_SASH_SIZE: m_sash_size = new_val; break; - case wxAUI_ART_CAPTION_SIZE: m_caption_size = new_val; break; - case wxAUI_ART_GRIPPER_SIZE: m_gripper_size = new_val; break; - case wxAUI_ART_PANE_BORDER_SIZE: m_border_size = new_val; break; - case wxAUI_ART_PANE_BUTTON_SIZE: m_button_size = new_val; break; - case wxAUI_ART_GRADIENT_TYPE: m_gradient_type = new_val; break; + case wxAUI_DOCKART_SASH_SIZE: m_sash_size = new_val; break; + case wxAUI_DOCKART_CAPTION_SIZE: m_caption_size = new_val; break; + case wxAUI_DOCKART_GRIPPER_SIZE: m_gripper_size = new_val; break; + case wxAUI_DOCKART_PANE_BORDER_SIZE: m_border_size = new_val; break; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_button_size = new_val; break; + case wxAUI_DOCKART_GRADIENT_TYPE: m_gradient_type = new_val; break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } } @@ -307,16 +314,16 @@ wxColour wxAuiDefaultDockArt::GetColour(int id) { switch (id) { - case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); - case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour(); - case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; - case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; - case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; - case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; - case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; - case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; - case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour(); - case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); + case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); + case wxAUI_DOCKART_SASH_COLOUR: return m_sash_brush.GetColour(); + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; + case wxAUI_DOCKART_BORDER_COLOUR: return m_border_pen.GetColour(); + case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -327,51 +334,49 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) { switch (id) { - case wxAUI_ART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; - case wxAUI_ART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; - case wxAUI_ART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; - case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; - case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; - case wxAUI_ART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; - case wxAUI_ART_GRIPPER_COLOUR: + case wxAUI_DOCKART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; + case wxAUI_DOCKART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; + case wxAUI_DOCKART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; + case wxAUI_DOCKART_GRIPPER_COLOUR: m_gripper_brush.SetColour(colour); - m_gripper_pen1.SetColour(StepColour(colour, 40)); - m_gripper_pen2.SetColour(StepColour(colour, 60)); + m_gripper_pen1.SetColour(colour.ChangeLightness(40)); + m_gripper_pen2.SetColour(colour.ChangeLightness(60)); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } + + InitBitmaps(); } void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) { - if (id == wxAUI_ART_CAPTION_FONT) + if (id == wxAUI_DOCKART_CAPTION_FONT) m_caption_font = font; } wxFont wxAuiDefaultDockArt::GetFont(int id) { - if (id == wxAUI_ART_CAPTION_FONT) + if (id == wxAUI_DOCKART_CAPTION_FONT) return m_caption_font; return wxNullFont; } 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(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 + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext() ; HIThemeSplitterDrawInfo drawInfo ; drawInfo.version = 0 ; @@ -379,13 +384,13 @@ 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); + dc.SetBrush(m_sash_brush); + dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); +#if 0 GdkRectangle gdk_rect; if (orientation == wxVERTICAL ) { @@ -401,15 +406,16 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, gdk_rect.width = rect.width; gdk_rect.height = m_sash_size; } +#endif if (!window) return; if (!window->m_wxwindow) return; - if (!GTK_PIZZA(window->m_wxwindow)->bin_window) return; + if (!GTK_WIDGET_DRAWABLE(window->m_wxwindow)) return; gtk_paint_handle ( window->m_wxwindow->style, - GTK_PIZZA(window->m_wxwindow)->bin_window, + window->GTKGetDrawingWindow(), // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_STATE_NORMAL, GTK_SHADOW_NONE, @@ -453,7 +459,7 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const dc.SetBrush(*wxTRANSPARENT_BRUSH); wxRect rect = _rect; - int i, border_width = GetMetric(wxAUI_ART_PANE_BORDER_SIZE); + int i, border_width = GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); if (pane.IsToolbar()) { @@ -487,7 +493,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo { if (active) dc.SetBrush(wxBrush(m_active_caption_colour)); - else + else dc.SetBrush(wxBrush(m_inactive_caption_colour)); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); @@ -510,7 +516,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo m_gradient_type); #endif } - else + else { #ifdef __WXMAC__ // on mac the gradients are expected to become darker from the top @@ -556,11 +562,11 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), if (pane.HasCloseButton()) clip_rect.width -= m_button_size; if (pane.HasPinButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_button_size; if (pane.HasMaximizeButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_button_size; - wxString draw_text = ChopText(dc, text, clip_rect.width); + wxString draw_text = wxAuiChopText(dc, text, clip_rect.width); dc.SetClippingRegion(clip_rect); dc.DrawText(draw_text, rect.x+3, rect.y+(rect.height/2)-(h/2)-1); @@ -624,8 +630,50 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& _rect, wxAuiPaneInfo& pane) { + wxBitmap bmp; + if (!(&pane)) + return; + switch (button) + { + default: + case wxAUI_BUTTON_CLOSE: + if (pane.state & wxAuiPaneInfo::optionActive) + bmp = m_active_close_bitmap; + else + bmp = m_inactive_close_bitmap; + break; + case wxAUI_BUTTON_PIN: + if (pane.state & wxAuiPaneInfo::optionActive) + bmp = m_active_pin_bitmap; + else + bmp = m_inactive_pin_bitmap; + break; + case wxAUI_BUTTON_MAXIMIZE_RESTORE: + if (pane.IsMaximized()) + { + if (pane.state & wxAuiPaneInfo::optionActive) + bmp = m_active_restore_bitmap; + else + bmp = m_inactive_restore_bitmap; + } + else + { + if (pane.state & wxAuiPaneInfo::optionActive) + bmp = m_active_maximize_bitmap; + else + bmp = m_inactive_maximize_bitmap; + } + break; + } + + wxRect rect = _rect; + int old_y = rect.y; + rect.y = rect.y + (rect.height/2) - (bmp.GetHeight()/2); + rect.height = old_y + rect.height - rect.y - 1; + + if (button_state == wxAUI_BUTTON_STATE_PRESSED) { rect.x++; @@ -637,49 +685,19 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), { if (pane.state & wxAuiPaneInfo::optionActive) { - dc.SetBrush(wxBrush(StepColour(m_active_caption_colour, 120))); - dc.SetPen(wxPen(StepColour(m_active_caption_colour, 70))); + dc.SetBrush(wxBrush(m_active_caption_colour.ChangeLightness(120))); + dc.SetPen(wxPen(m_active_caption_colour.ChangeLightness(70))); } - else + else { - dc.SetBrush(wxBrush(StepColour(m_inactive_caption_colour, 120))); - dc.SetPen(wxPen(StepColour(m_inactive_caption_colour, 70))); + dc.SetBrush(wxBrush(m_inactive_caption_colour.ChangeLightness(120))); + dc.SetPen(wxPen(m_inactive_caption_colour.ChangeLightness(70))); } // draw the background behind the button dc.DrawRectangle(rect.x, rect.y, 15, 15); } - wxBitmap bmp; - switch (button) - { - default: - case wxAUI_BUTTON_MAXIMIZE_RESTORE: - if (pane.IsMaximized()) { - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_restore_bitmap; - else - bmp = m_inactive_restore_bitmap; - } else { - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_maximize_bitmap; - else - bmp = m_inactive_maximize_bitmap; - } - break; - case wxAUI_BUTTON_CLOSE: - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_close_bitmap; - else - bmp = m_inactive_close_bitmap; - break; - case wxAUI_BUTTON_PIN: - if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_pin_bitmap; - else - bmp = m_inactive_pin_bitmap; - break; - } // draw the button itself dc.DrawBitmap(bmp, rect.x, rect.y, true);