#include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h"
+#include "wx/aui/auibook.h"
+#include "wx/aui/tabart.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
#ifdef __WXGTK__
#include <gtk/gtk.h>
#include "wx/renderer.h"
-#if GTK_CHECK_VERSION(2,0,0)
+#ifdef __WXGTK20__
#include "wx/gtk/private/gtk2-compat.h"
#else
#define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
#endif
+#ifdef __WXGTK3__
+ #include "wx/graphics.h"
+#endif
#endif
wxAuiDefaultDockArt::wxAuiDefaultDockArt()
{
#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
- wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+ wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
#else
- wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
#endif
- // the base_colour is too pale to use as our base colour,
+ // the baseColour 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)
+ if ((255-baseColour.Red()) +
+ (255-baseColour.Green()) +
+ (255-baseColour.Blue()) < 60)
{
- base_colour = base_colour.ChangeLightness(92);
+ baseColour = baseColour.ChangeLightness(92);
}
- m_base_colour = base_colour;
- 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 = 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 = base_colour.ChangeLightness(97);
- m_inactive_caption_text_colour = *wxBLACK;
-
- m_sash_brush = wxBrush(base_colour);
- m_background_brush = wxBrush(base_colour);
- m_gripper_brush = wxBrush(base_colour);
-
- m_border_pen = wxPen(darker2_colour);
- m_gripper_pen1 = wxPen(darker5_colour);
- m_gripper_pen2 = wxPen(darker3_colour);
- m_gripper_pen3 = *wxWHITE_PEN;
+ m_baseColour = baseColour;
+ wxColor darker1Colour = baseColour.ChangeLightness(85);
+ wxColor darker2Colour = baseColour.ChangeLightness(75);
+ wxColor darker3Colour = baseColour.ChangeLightness(60);
+ //wxColor darker4Colour = baseColour.ChangeLightness(50);
+ wxColor darker5Colour = baseColour.ChangeLightness(40);
+
+ m_activeCaptionColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ m_activeCaptionGradientColour = wxAuiLightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+ m_activeCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ m_inactiveCaptionColour = darker1Colour;
+ m_inactiveCaptionGradientColour = baseColour.ChangeLightness(97);
+ m_inactiveCaptionTextColour = *wxBLACK;
+
+ m_sashBrush = wxBrush(baseColour);
+ m_backgroundBrush = wxBrush(baseColour);
+ m_gripperBrush = wxBrush(baseColour);
+
+ m_borderPen = wxPen(darker2Colour);
+ m_gripperPen1 = wxPen(darker5Colour);
+ m_gripperPen2 = wxPen(darker3Colour);
+ m_gripperPen3 = *wxWHITE_PEN;
#ifdef __WXMAC__
- m_caption_font = *wxSMALL_FONT;
+ m_captionFont = *wxSMALL_FONT;
#else
- m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE);
+ m_captionFont = 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;
+ m_sashSize = height;
#elif defined(__WXGTK__)
- m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash;
+ m_sashSize = wxRendererNative::Get().GetSplitterParams(NULL).widthSash;
#else
- m_sash_size = 4;
+ m_sashSize = 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_captionSize = 17;
+ m_borderSize = 1;
+ m_buttonSize = 14;
+ m_gripperSize = 9;
+ m_gradientType = wxAUI_GRADIENT_VERTICAL;
InitBitmaps();
}
0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
#ifdef __WXMAC__
- m_inactive_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE);
- m_active_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE );
+ m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE);
+ m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE );
#else
- 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);
+ m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_inactiveCaptionTextColour);
+ m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_activeCaptionTextColour);
#endif
#ifdef __WXMAC__
- m_inactive_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE);
- m_active_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE );
+ m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE);
+ m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE );
#else
- 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);
+ m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_inactiveCaptionTextColour);
+ m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_activeCaptionTextColour);
#endif
#ifdef __WXMAC__
- m_inactive_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE);
- m_active_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE );
+ m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE);
+ m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE );
#else
- 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);
+ m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_inactiveCaptionTextColour);
+ m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_activeCaptionTextColour);
#endif
- 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);
+ m_inactivePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactiveCaptionTextColour);
+ m_activePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_activeCaptionTextColour);
}
int wxAuiDefaultDockArt::GetMetric(int id)
{
switch (id)
{
- 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;
+ case wxAUI_DOCKART_SASH_SIZE: return m_sashSize;
+ case wxAUI_DOCKART_CAPTION_SIZE: return m_captionSize;
+ case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripperSize;
+ case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_borderSize;
+ case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_buttonSize;
+ case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradientType;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
}
{
switch (id)
{
- 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;
+ case wxAUI_DOCKART_SASH_SIZE: m_sashSize = new_val; break;
+ case wxAUI_DOCKART_CAPTION_SIZE: m_captionSize = new_val; break;
+ case wxAUI_DOCKART_GRIPPER_SIZE: m_gripperSize = new_val; break;
+ case wxAUI_DOCKART_PANE_BORDER_SIZE: m_borderSize = new_val; break;
+ case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_buttonSize = new_val; break;
+ case wxAUI_DOCKART_GRADIENT_TYPE: m_gradientType = new_val; break;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
}
}
{
switch (id)
{
- 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();
+ case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_backgroundBrush.GetColour();
+ case wxAUI_DOCKART_SASH_COLOUR: return m_sashBrush.GetColour();
+ case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactiveCaptionColour;
+ case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactiveCaptionGradientColour;
+ case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactiveCaptionTextColour;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_activeCaptionColour;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_activeCaptionGradientColour;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_activeCaptionTextColour;
+ case wxAUI_DOCKART_BORDER_COLOUR: return m_borderPen.GetColour();
+ case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripperBrush.GetColour();
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
}
{
switch (id)
{
- 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_BACKGROUND_COLOUR: m_backgroundBrush.SetColour(colour); break;
+ case wxAUI_DOCKART_SASH_COLOUR: m_sashBrush.SetColour(colour); break;
+ case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactiveCaptionColour = colour; break;
+ case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactiveCaptionGradientColour = colour; break;
+ case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactiveCaptionTextColour = colour; break;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_activeCaptionColour = colour; break;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_activeCaptionGradientColour = colour; break;
+ case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_activeCaptionTextColour = colour; break;
+ case wxAUI_DOCKART_BORDER_COLOUR: m_borderPen.SetColour(colour); break;
case wxAUI_DOCKART_GRIPPER_COLOUR:
- m_gripper_brush.SetColour(colour);
- m_gripper_pen1.SetColour(colour.ChangeLightness(40));
- m_gripper_pen2.SetColour(colour.ChangeLightness(60));
+ m_gripperBrush.SetColour(colour);
+ m_gripperPen1.SetColour(colour.ChangeLightness(40));
+ m_gripperPen2.SetColour(colour.ChangeLightness(60));
break;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
}
void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font)
{
if (id == wxAUI_DOCKART_CAPTION_FONT)
- m_caption_font = font;
+ m_captionFont = font;
}
wxFont wxAuiDefaultDockArt::GetFont(int id)
{
if (id == wxAUI_DOCKART_CAPTION_FONT)
- return m_caption_font;
+ return m_captionFont;
return wxNullFont;
}
#elif defined(__WXGTK__)
// clear out the rectangle first
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(m_sash_brush);
+ dc.SetBrush(m_sashBrush);
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
#if 0
{
gdk_rect.x = rect.x;
gdk_rect.y = rect.y;
- gdk_rect.width = m_sash_size;
+ gdk_rect.width = m_sashSize;
gdk_rect.height = rect.height;
}
else
gdk_rect.x = rect.x;
gdk_rect.y = rect.y;
gdk_rect.width = rect.width;
- gdk_rect.height = m_sash_size;
+ gdk_rect.height = m_sashSize;
}
#endif
gtk_paint_handle
(
gtk_widget_get_style(window->m_wxwindow),
+#ifdef __WXGTK3__
+ static_cast<cairo_t*>(dc.GetGraphicsContext()->GetNativeContext()),
+#else
window->GTKGetDrawingWindow(),
+#endif
// flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
+#ifndef __WXGTK3__
NULL /* no clipping */,
+#endif
window->m_wxwindow,
"paned",
rect.x,
wxUnusedVar(window);
wxUnusedVar(orientation);
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(m_sash_brush);
+ dc.SetBrush(m_sashBrush);
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
#endif
}
dc.SetBrush(*wxWHITE_BRUSH) ;
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
#endif
- dc.SetBrush(m_background_brush);
+ dc.SetBrush(m_backgroundBrush);
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
}
-void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& _rect,
+void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& _rect,
wxAuiPaneInfo& pane)
{
- dc.SetPen(m_border_pen);
+ dc.SetPen(m_borderPen);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
wxRect rect = _rect;
dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y);
dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height);
- dc.SetPen(m_border_pen);
+ dc.SetPen(m_borderPen);
dc.DrawLine(rect.x, rect.y+rect.height-1,
rect.x+rect.width, rect.y+rect.height-1);
dc.DrawLine(rect.x+rect.width-1, rect.y,
}
else
{
- for (i = 0; i < border_width; ++i)
+ // notebooks draw the border themselves, so they can use native rendering (e.g. tabartgtk)
+ wxAuiTabArt* art = 0;
+ wxAuiNotebook* nb = wxDynamicCast(window, wxAuiNotebook);
+ if (nb)
+ art = nb->GetArtProvider();
+
+ if (art)
+ art->DrawBorder(dc, window, rect);
+ else
{
- dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
- rect.Deflate(1);
+ for (i = 0; i < border_width; ++i)
+ {
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+ rect.Deflate(1);
+ }
}
}
}
void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active)
{
- if (m_gradient_type == wxAUI_GRADIENT_NONE)
+ if (m_gradientType == wxAUI_GRADIENT_NONE)
{
if (active)
- dc.SetBrush(wxBrush(m_active_caption_colour));
+ dc.SetBrush(wxBrush(m_activeCaptionColour));
else
- dc.SetBrush(wxBrush(m_inactive_caption_colour));
+ dc.SetBrush(wxBrush(m_inactiveCaptionColour));
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
}
// on mac the gradients are expected to become darker from the top
#ifdef __WXMAC__
DrawGradientRectangle(dc, rect,
- m_active_caption_colour,
- m_active_caption_gradient_colour,
- m_gradient_type);
+ m_activeCaptionColour,
+ m_activeCaptionGradientColour,
+ m_gradientType);
#else
// on other platforms, active gradients become lighter at the top
DrawGradientRectangle(dc, rect,
- m_active_caption_gradient_colour,
- m_active_caption_colour,
- m_gradient_type);
+ m_activeCaptionGradientColour,
+ m_activeCaptionColour,
+ m_gradientType);
#endif
}
else
#ifdef __WXMAC__
// on mac the gradients are expected to become darker from the top
DrawGradientRectangle(dc, rect,
- m_inactive_caption_gradient_colour,
- m_inactive_caption_colour,
- m_gradient_type);
+ m_inactiveCaptionGradientColour,
+ m_inactiveCaptionColour,
+ m_gradientType);
#else
// on other platforms, inactive gradients become lighter at the bottom
DrawGradientRectangle(dc, rect,
- m_inactive_caption_colour,
- m_inactive_caption_gradient_colour,
- m_gradient_type);
+ m_inactiveCaptionColour,
+ m_inactiveCaptionGradientColour,
+ m_gradientType);
#endif
}
}
wxAuiPaneInfo& pane)
{
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetFont(m_caption_font);
+ dc.SetFont(m_captionFont);
DrawCaptionBackground(dc, rect,
(pane.state & wxAuiPaneInfo::optionActive)?true:false);
}
if (pane.state & wxAuiPaneInfo::optionActive)
- dc.SetTextForeground(m_active_caption_text_colour);
+ dc.SetTextForeground(m_activeCaptionTextColour);
else
- dc.SetTextForeground(m_inactive_caption_text_colour);
+ dc.SetTextForeground(m_inactiveCaptionTextColour);
wxCoord w,h;
clip_rect.width -= 3; // text offset
clip_rect.width -= 2; // button padding
if (pane.HasCloseButton())
- clip_rect.width -= m_button_size;
+ clip_rect.width -= m_buttonSize;
if (pane.HasPinButton())
- clip_rect.width -= m_button_size;
+ clip_rect.width -= m_buttonSize;
if (pane.HasMaximizeButton())
- clip_rect.width -= m_button_size;
+ clip_rect.width -= m_buttonSize;
wxString draw_text = wxAuiChopText(dc, text, clip_rect.width);
wxAuiPaneInfo& pane)
{
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(m_gripper_brush);
+ dc.SetBrush(m_gripperBrush);
dc.DrawRectangle(rect.x, rect.y, rect.width,rect.height);
int y = 5;
while (1)
{
- dc.SetPen(m_gripper_pen1);
+ dc.SetPen(m_gripperPen1);
dc.DrawPoint(rect.x+3, rect.y+y);
- dc.SetPen(m_gripper_pen2);
+ dc.SetPen(m_gripperPen2);
dc.DrawPoint(rect.x+3, rect.y+y+1);
dc.DrawPoint(rect.x+4, rect.y+y);
- dc.SetPen(m_gripper_pen3);
+ dc.SetPen(m_gripperPen3);
dc.DrawPoint(rect.x+5, rect.y+y+1);
dc.DrawPoint(rect.x+5, rect.y+y+2);
dc.DrawPoint(rect.x+4, rect.y+y+2);
int x = 5;
while (1)
{
- dc.SetPen(m_gripper_pen1);
+ dc.SetPen(m_gripperPen1);
dc.DrawPoint(rect.x+x, rect.y+3);
- dc.SetPen(m_gripper_pen2);
+ dc.SetPen(m_gripperPen2);
dc.DrawPoint(rect.x+x+1, rect.y+3);
dc.DrawPoint(rect.x+x, rect.y+4);
- dc.SetPen(m_gripper_pen3);
+ dc.SetPen(m_gripperPen3);
dc.DrawPoint(rect.x+x+1, rect.y+5);
dc.DrawPoint(rect.x+x+2, rect.y+5);
dc.DrawPoint(rect.x+x+2, rect.y+4);
default:
case wxAUI_BUTTON_CLOSE:
if (pane.state & wxAuiPaneInfo::optionActive)
- bmp = m_active_close_bitmap;
+ bmp = m_activeCloseBitmap;
else
- bmp = m_inactive_close_bitmap;
+ bmp = m_inactiveCloseBitmap;
break;
case wxAUI_BUTTON_PIN:
if (pane.state & wxAuiPaneInfo::optionActive)
- bmp = m_active_pin_bitmap;
+ bmp = m_activePinBitmap;
else
- bmp = m_inactive_pin_bitmap;
+ bmp = m_inactivePinBitmap;
break;
case wxAUI_BUTTON_MAXIMIZE_RESTORE:
if (pane.IsMaximized())
{
if (pane.state & wxAuiPaneInfo::optionActive)
- bmp = m_active_restore_bitmap;
+ bmp = m_activeRestoreBitmap;
else
- bmp = m_inactive_restore_bitmap;
+ bmp = m_inactiveRestoreBitmap;
}
else
{
if (pane.state & wxAuiPaneInfo::optionActive)
- bmp = m_active_maximize_bitmap;
+ bmp = m_activeMaximizeBitmap;
else
- bmp = m_inactive_maximize_bitmap;
+ bmp = m_inactiveMaximizeBitmap;
}
break;
}
{
if (pane.state & wxAuiPaneInfo::optionActive)
{
- dc.SetBrush(wxBrush(m_active_caption_colour.ChangeLightness(120)));
- dc.SetPen(wxPen(m_active_caption_colour.ChangeLightness(70)));
+ dc.SetBrush(wxBrush(m_activeCaptionColour.ChangeLightness(120)));
+ dc.SetPen(wxPen(m_activeCaptionColour.ChangeLightness(70)));
}
else
{
- dc.SetBrush(wxBrush(m_inactive_caption_colour.ChangeLightness(120)));
- dc.SetPen(wxPen(m_inactive_caption_colour.ChangeLightness(70)));
+ dc.SetBrush(wxBrush(m_inactiveCaptionColour.ChangeLightness(120)));
+ dc.SetPen(wxPen(m_inactiveCaptionColour.ChangeLightness(70)));
}
// draw the background behind the button
projects / wxWidgets.git / blobdiff