Escape underscores

[wxWidgets.git] / include / wx / generic / tabg.h

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 2badfdbc2ff13fad271cc0281e6b9d2dc98f82d3..30cfeaf587df46237106731815dae801487daebe 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __TABGH_G__
 #define __TABGH_G__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "tabg.h"
-#endif
-
 #define WXTAB_VERSION   1.1
 
 #include "wx/hashmap.h"
@@ -107,7 +103,7 @@ public:
 
   inline int GetNumberOfLayers() const { return m_layers.GetCount(); }
 #if WXWIN_COMPATIBILITY_2_4
-  inline wxList& GetLayers() { return (wxList&)m_layers; }
+  inline wxList& GetLayers() { return *(wxList *)&m_layers; }
 #else
   inline wxTabLayerList& GetLayers() { return m_layers; }
 #endif
@@ -152,10 +148,10 @@ public:
   inline wxColour GetShadowColour(void) const { return m_shadowColour; }
   inline wxColour GetBackgroundColour(void) const { return m_backgroundColour; }
   inline wxColour GetTextColour(void) const { return m_textColour; }
-  inline wxPen *GetHighlightPen(void) const { return m_highlightPen; }
-  inline wxPen *GetShadowPen(void) const { return m_shadowPen; }
-  inline wxPen *GetBackgroundPen(void) const { return m_backgroundPen; }
-  inline wxBrush *GetBackgroundBrush(void) const { return m_backgroundBrush; }
+  inline const wxPen *GetHighlightPen(void) const { return m_highlightPen; }
+  inline const wxPen *GetShadowPen(void) const { return m_shadowPen; }
+  inline const wxPen *GetBackgroundPen(void) const { return m_backgroundPen; }
+  inline const wxBrush *GetBackgroundBrush(void) const { return m_backgroundBrush; }
 
   inline void SetViewRect(const wxRect& rect) { m_tabViewRect = rect; }
   inline wxRect GetViewRect(void) const { return m_tabViewRect; }
@@ -257,10 +253,10 @@ protected:
    wxColour         m_textColour;
 
    // Pen and brush cache
-   wxPen*           m_highlightPen;
-   wxPen*           m_shadowPen;
-   wxPen*           m_backgroundPen;
-   wxBrush*         m_backgroundBrush;
+   const wxPen*     m_highlightPen;
+   const wxPen*     m_shadowPen;
+   const wxPen*     m_backgroundPen;
+   const wxBrush*   m_backgroundBrush;
 
    wxFont           m_tabFont;
    wxFont           m_tabSelectedFont;