Document wxKill(wxSIGTERM) reliance on having an open window in wxMSW.

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

diff --git a/include/wx/aui/tabart.h b/include/wx/aui/tabart.h
index 68a0e0911801151ff178c0b1c95446c585060437..4a449678ac401d696da3d13ed23de2b7adf2e0ec 100644 (file)
--- a/include/wx/aui/tabart.h
+++ b/include/wx/aui/tabart.h
@@ -4,7 +4,7 @@
 // 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:$
+// 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 +56,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 +100,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 +132,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 +162,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 +231,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 +261,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,


@@ -276,7 +309,7 @@ protected:
 };
 
 #ifndef __WXUNIVERSAL__
 };
 
 #ifndef __WXUNIVERSAL__

-    #if defined(__WXGTK20__)
+    #if defined(__WXGTK20__) && !defined(__WXGTK3__)

         #define wxHAS_NATIVE_TABART
         #include "wx/aui/tabartgtk.h"
         #define wxAuiDefaultTabArt wxAuiGtkTabArt
         #define wxHAS_NATIVE_TABART
         #include "wx/aui/tabartgtk.h"
         #define wxAuiDefaultTabArt wxAuiGtkTabArt