fix borland header difference

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

diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h
index 8bafde4ffce0d7af05e69fb0a907672da5340d66..fb21ae5acd587bdf4eebfd794fd7180a22e5a4cf 100644 (file)
--- a/include/wx/aui/dockart.h
+++ b/include/wx/aui/dockart.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dockart.h
+// Name:        wx/aui/dockart.h
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,6 +20,10 @@
 
 #if wxUSE_AUI
 
+#include "wx/pen.h"
+#include "wx/brush.h"
+#include "wx/bitmap.h"
+#include "wx/colour.h"
 
 // dock art provider code - a dock provider provides all drawing
 // functionality to the wxAui dock manager.  This allows the dock
@@ -38,31 +42,37 @@ public:
     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,
+                          wxWindow *window,
                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawBackground(wxDC& dc,
+                          wxWindow *window,
                           int orientation,
                           const wxRect& rect) = 0;
 
     virtual void DrawCaption(wxDC& dc,
+                          wxWindow *window,
                           const wxString& text,
                           const wxRect& rect,
                           wxPaneInfo& pane) = 0;
 
     virtual void DrawGripper(wxDC& dc,
+                          wxWindow *window,
                           const wxRect& rect,
                           wxPaneInfo& pane) = 0;
 
     virtual void DrawBorder(wxDC& dc,
+                          wxWindow *window,
                           const wxRect& rect,
                           wxPaneInfo& pane) = 0;
 
     virtual void DrawPaneButton(wxDC& dc,
+                          wxWindow *window,
                           int button,
                           int button_state,
                           const wxRect& rect,
@@ -88,27 +98,33 @@ public:
     wxFont GetFont(int id);
 
     void DrawSash(wxDC& dc,
+                  wxWindow *window,
                   int orientation,
                   const wxRect& rect);
 
     void DrawBackground(wxDC& dc,
+                  wxWindow *window,
                   int orientation,
                   const wxRect& rect);
 
     void DrawCaption(wxDC& dc,
+                  wxWindow *window,
                   const wxString& text,
                   const wxRect& rect,
                   wxPaneInfo& pane);
 
     void DrawGripper(wxDC& dc,
+                  wxWindow *window,
                   const wxRect& rect,
                   wxPaneInfo& pane);
 
     void DrawBorder(wxDC& dc,
+                  wxWindow *window,
                   const wxRect& rect,
                   wxPaneInfo& pane);
 
     void DrawPaneButton(wxDC& dc,
+                  wxWindow *window,
                   int button,
                   int button_state,
                   const wxRect& rect,