added wxTLS_TYPE() macro

[wxWidgets.git] / include / wx / aui / dockart.h

diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h
index b070cfab0b3b9b9be45592d7d9e6ca22b9a15d26..dbe21f332b41128c7eff6b14b15ed930181905bf 100644 (file)
--- a/include/wx/aui/dockart.h
+++ b/include/wx/aui/dockart.h
@@ -29,12 +29,12 @@
 // functionality to the wxAui dock manager.  This allows the dock
 // manager to have plugable look-and-feels
 
 // functionality to the wxAui dock manager.  This allows the dock
 // manager to have plugable look-and-feels
 

-class WXDLLIMPEXP_AUI wxDockArt
+class WXDLLIMPEXP_AUI wxAuiDockArt

 {
 public:
 
 {
 public:
 

-    wxDockArt() { }
-    virtual ~wxDockArt() { }
+    wxAuiDockArt() { }
+    virtual ~wxAuiDockArt() { }

 
     virtual int GetMetric(int id) = 0;
     virtual void SetMetric(int id, int new_val) = 0;
 
     virtual int GetMetric(int id) = 0;
     virtual void SetMetric(int id, int new_val) = 0;


@@ -42,47 +42,53 @@ public:
     virtual wxFont GetFont(int id) = 0;
     virtual wxColour GetColour(int id) = 0;
     virtual void SetColour(int id, const wxColor& colour) = 0;
     virtual wxFont GetFont(int id) = 0;
     virtual wxColour GetColour(int id) = 0;
     virtual void SetColour(int id, const wxColor& colour) = 0;

-    wxColor GetColor(int id) { return GetColour(id); }
-    void SetColor(int id, const wxColor& color) { SetColour(id, color); }
+    wxColour GetColor(int id) { return GetColour(id); }
+    void SetColor(int id, const wxColour& color) { SetColour(id, color); }

 
     virtual void DrawSash(wxDC& dc,
 
     virtual void DrawSash(wxDC& dc,

+                          wxWindow* window,

                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawBackground(wxDC& dc,
                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawBackground(wxDC& dc,

+                          wxWindow* window,

                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawCaption(wxDC& dc,
                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawCaption(wxDC& dc,

+                          wxWindow* window,

                           const wxString& text,
                           const wxRect& rect,
                           const wxString& text,
                           const wxRect& rect,

-                          wxPaneInfo& pane) = 0;
+                          wxAuiPaneInfo& pane) = 0;

 
     virtual void DrawGripper(wxDC& dc,
 
     virtual void DrawGripper(wxDC& dc,

+                          wxWindow* window,

                           const wxRect& rect,
                           const wxRect& rect,

-                          wxPaneInfo& pane) = 0;
+                          wxAuiPaneInfo& pane) = 0;

 
     virtual void DrawBorder(wxDC& dc,
 
     virtual void DrawBorder(wxDC& dc,

+                          wxWindow* window,

                           const wxRect& rect,
                           const wxRect& rect,

-                          wxPaneInfo& pane) = 0;
+                          wxAuiPaneInfo& pane) = 0;

 
     virtual void DrawPaneButton(wxDC& dc,
 
     virtual void DrawPaneButton(wxDC& dc,

+                          wxWindow* window,

                           int button,
                           int button_state,
                           const wxRect& rect,
                           int button,
                           int button_state,
                           const wxRect& rect,

-                          wxPaneInfo& pane) = 0;
+                          wxAuiPaneInfo& pane) = 0;

 };
 
 
 };
 
 

-// this is the default art provider for wxFrameManager.  Dock art
+// this is the default art provider for wxAuiManager.  Dock art

 // can be customized by creating a class derived from this one,
 // or replacing this class entirely
 
 // can be customized by creating a class derived from this one,
 // or replacing this class entirely
 

-class WXDLLIMPEXP_AUI wxDefaultDockArt : public wxDockArt
+class WXDLLIMPEXP_AUI wxAuiDefaultDockArt : public wxAuiDockArt

 {
 public:
 
 {
 public:
 

-    wxDefaultDockArt();
+    wxAuiDefaultDockArt();

 
     int GetMetric(int metric_id);
     void SetMetric(int metric_id, int new_val);
 
     int GetMetric(int metric_id);
     void SetMetric(int metric_id, int new_val);


@@ -92,31 +98,37 @@ public:
     wxFont GetFont(int id);
 
     void DrawSash(wxDC& dc,
     wxFont GetFont(int id);
 
     void DrawSash(wxDC& dc,

+                  wxWindow *window,

                   int orientation,
                   const wxRect& rect);
 
     void DrawBackground(wxDC& dc,
                   int orientation,
                   const wxRect& rect);
 
     void DrawBackground(wxDC& dc,

+                  wxWindow *window,

                   int orientation,
                   const wxRect& rect);
 
     void DrawCaption(wxDC& dc,
                   int orientation,
                   const wxRect& rect);
 
     void DrawCaption(wxDC& dc,

+                  wxWindow *window,

                   const wxString& text,
                   const wxRect& rect,
                   const wxString& text,
                   const wxRect& rect,

-                  wxPaneInfo& pane);
+                  wxAuiPaneInfo& pane);

 
     void DrawGripper(wxDC& dc,
 
     void DrawGripper(wxDC& dc,

+                  wxWindow *window,

                   const wxRect& rect,
                   const wxRect& rect,

-                  wxPaneInfo& pane);
+                  wxAuiPaneInfo& pane);

 
     void DrawBorder(wxDC& dc,
 
     void DrawBorder(wxDC& dc,

+                  wxWindow *window,

                   const wxRect& rect,
                   const wxRect& rect,

-                  wxPaneInfo& pane);
+                  wxAuiPaneInfo& pane);

 
     void DrawPaneButton(wxDC& dc,
 
     void DrawPaneButton(wxDC& dc,

+                  wxWindow *window,

                   int button,
                   int button_state,
                   const wxRect& rect,
                   int button,
                   int button_state,
                   const wxRect& rect,

-                  wxPaneInfo& pane);
+                  wxAuiPaneInfo& pane);

 
 protected:
 
 
 protected:
 


@@ -131,11 +143,16 @@ protected:
     wxFont m_caption_font;
     wxBitmap m_inactive_close_bitmap;
     wxBitmap m_inactive_pin_bitmap;
     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_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;
     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_active_caption_colour;
     wxColour m_active_caption_gradient_colour;
     wxColour m_active_caption_text_colour;