X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1114a102d5f1ecb49516058028ede501da153809..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/aui/dockart.h diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h index dbe21f332b..c7b89f9a1f 100644 --- a/include/wx/aui/dockart.h +++ b/include/wx/aui/dockart.h @@ -37,7 +37,7 @@ public: virtual ~wxAuiDockArt() { } virtual int GetMetric(int id) = 0; - virtual void SetMetric(int id, int new_val) = 0; + virtual void SetMetric(int id, int newVal) = 0; virtual void SetFont(int id, const wxFont& font) = 0; virtual wxFont GetFont(int id) = 0; virtual wxColour GetColour(int id) = 0; @@ -74,7 +74,7 @@ public: virtual void DrawPaneButton(wxDC& dc, wxWindow* window, int button, - int button_state, + int buttonState, const wxRect& rect, wxAuiPaneInfo& pane) = 0; }; @@ -90,8 +90,8 @@ public: wxAuiDefaultDockArt(); - int GetMetric(int metric_id); - void SetMetric(int metric_id, int new_val); + int GetMetric(int metricId); + void SetMetric(int metricId, int newVal); wxColour GetColour(int id); void SetColour(int id, const wxColor& colour); void SetFont(int id, const wxFont& font); @@ -126,7 +126,11 @@ public: void DrawPaneButton(wxDC& dc, wxWindow *window, int button, - int button_state, + int buttonState, + const wxRect& rect, + wxAuiPaneInfo& pane); + + void DrawIcon(wxDC& dc, const wxRect& rect, wxAuiPaneInfo& pane); @@ -134,37 +138,39 @@ protected: void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active); + void InitBitmaps(); + protected: - wxPen m_border_pen; - wxBrush m_sash_brush; - wxBrush m_background_brush; - wxBrush m_gripper_brush; - wxFont m_caption_font; - wxBitmap m_inactive_close_bitmap; - wxBitmap m_inactive_pin_bitmap; - wxBitmap m_inactive_maximize_bitmap; - wxBitmap m_inactive_restore_bitmap; - wxBitmap m_active_close_bitmap; - wxBitmap m_active_pin_bitmap; - wxBitmap m_active_maximize_bitmap; - wxBitmap m_active_restore_bitmap; - wxPen m_gripper_pen1; - wxPen m_gripper_pen2; - wxPen m_gripper_pen3; - wxColour m_base_colour; - wxColour m_active_caption_colour; - wxColour m_active_caption_gradient_colour; - wxColour m_active_caption_text_colour; - wxColour m_inactive_caption_colour; - wxColour m_inactive_caption_gradient_colour; - wxColour m_inactive_caption_text_colour; - int m_border_size; - int m_caption_size; - int m_sash_size; - int m_button_size; - int m_gripper_size; - int m_gradient_type; + wxPen m_borderPen; + wxBrush m_sashBrush; + wxBrush m_backgroundBrush; + wxBrush m_gripperBrush; + wxFont m_captionFont; + wxBitmap m_inactiveCloseBitmap; + wxBitmap m_inactivePinBitmap; + wxBitmap m_inactiveMaximizeBitmap; + wxBitmap m_inactiveRestoreBitmap; + wxBitmap m_activeCloseBitmap; + wxBitmap m_activePinBitmap; + wxBitmap m_activeMaximizeBitmap; + wxBitmap m_activeRestoreBitmap; + wxPen m_gripperPen1; + wxPen m_gripperPen2; + wxPen m_gripperPen3; + wxColour m_baseColour; + wxColour m_activeCaptionColour; + wxColour m_activeCaptionGradientColour; + wxColour m_activeCaptionTextColour; + wxColour m_inactiveCaptionColour; + wxColour m_inactiveCaptionGradientColour; + wxColour m_inactiveCaptionTextColour; + int m_borderSize; + int m_captionSize; + int m_sashSize; + int m_buttonSize; + int m_gripperSize; + int m_gradientType; };