using Run of base class

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

diff --git a/include/wx/aui/tabart.h b/include/wx/aui/tabart.h
index e1418f2743b66c58a07cd002efff2c9dd9faf730..3de076c9e323cb5036ce3a559002559c3d32fce4 100644 (file)
--- a/include/wx/aui/tabart.h
+++ b/include/wx/aui/tabart.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by: Jens Lody (extracted from wx/aui/auibook.h)
 // Created:     2012-03-21
 // Author:      Benjamin I. Williams
 // Modified by: Jens Lody (extracted from wx/aui/auibook.h)
 // Created:     2012-03-21

-// RCS-ID:      $Id:$

 // Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -56,6 +55,11 @@ public:
     virtual void SetColour(const wxColour& colour) = 0;
     virtual void SetActiveColour(const wxColour& colour) = 0;
 
     virtual void SetColour(const wxColour& colour) = 0;
     virtual void SetActiveColour(const wxColour& colour) = 0;
 

+    virtual void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect) = 0;
+

     virtual void DrawBackground(
                          wxDC& dc,
                          wxWindow* wnd,
     virtual void DrawBackground(
                          wxDC& dc,
                          wxWindow* wnd,


@@ -95,6 +99,12 @@ public:
 
     virtual int GetIndentSize() = 0;
 
 
     virtual int GetIndentSize() = 0;
 

+    virtual int GetBorderWidth(
+                         wxWindow* wnd) = 0;
+
+    virtual int GetAdditionalBorderSpace(
+                         wxWindow* wnd) = 0;
+

     virtual int GetBestTabCtrlSize(
                          wxWindow* wnd,
                          const wxAuiNotebookPageArray& pages,
     virtual int GetBestTabCtrlSize(
                          wxWindow* wnd,
                          const wxAuiNotebookPageArray& pages,


@@ -121,6 +131,11 @@ public:
     void SetColour(const wxColour& colour);
     void SetActiveColour(const wxColour& colour);
 
     void SetColour(const wxColour& colour);
     void SetActiveColour(const wxColour& colour);
 

+    void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+

     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,


@@ -146,6 +161,12 @@ public:
 
     int GetIndentSize();
 
 
     int GetIndentSize();
 

+    int GetBorderWidth(
+                 wxWindow* wnd);
+
+    int GetAdditionalBorderSpace(
+                 wxWindow* wnd);
+

     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,
     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,


@@ -209,6 +230,11 @@ public:
     void SetColour(const wxColour& colour);
     void SetActiveColour(const wxColour& colour);
 
     void SetColour(const wxColour& colour);
     void SetActiveColour(const wxColour& colour);
 

+    void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+

     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,


@@ -234,6 +260,12 @@ public:
 
     int GetIndentSize();
 
 
     int GetIndentSize();
 

+    int GetBorderWidth(
+                 wxWindow* wnd);
+
+    int GetAdditionalBorderSpace(
+                 wxWindow* wnd);
+

     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,
     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,


@@ -275,7 +307,17 @@ protected:
     unsigned int m_flags;
 };
 
     unsigned int m_flags;
 };
 

-#define wxAuiDefaultTabArt wxAuiGenericTabArt
+#ifndef __WXUNIVERSAL__
+    #if defined(__WXGTK20__) && !defined(__WXGTK3__)
+        #define wxHAS_NATIVE_TABART
+        #include "wx/aui/tabartgtk.h"
+        #define wxAuiDefaultTabArt wxAuiGtkTabArt
+    #endif
+#endif // !__WXUNIVERSAL__
+
+#ifndef wxHAS_NATIVE_TABART
+    #define wxAuiDefaultTabArt wxAuiGenericTabArt
+#endif

 
 #endif  // wxUSE_AUI
 
 
 #endif  // wxUSE_AUI