remove the vertical scrollbar completely if the control is empty

[wxWidgets.git] / contrib / include / wx / ogl / basic.h

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index eed1f44bb7bf45d6d91401b5578683dfb6311be8..0360f19c9ead5523fbd288aef6f38b0efc8bb8c8 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -17,7 +17,7 @@
 #endif
 
 #if wxUSE_DEPRECATED
 #endif
 
 #if wxUSE_DEPRECATED

-    #include <wx/deprecated/setup.h>
+    #include "wx/deprecated/setup.h"

 #endif
 
 #ifndef wxUSE_PROLOGIO
 #endif
 
 #ifndef wxUSE_PROLOGIO


@@ -300,8 +300,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   inline void SetId(long i) { m_id = i; }
   inline long GetId() const { return m_id; }
 
   inline void SetId(long i) { m_id = i; }
   inline long GetId() const { return m_id; }
 

-  void SetPen(wxPen *pen);
-  void SetBrush(wxBrush *brush);
+  void SetPen(const wxPen *pen);
+  void SetBrush(const wxBrush *brush);

 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }
 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }


@@ -329,8 +329,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
 
   void AddText(const wxString& string);
 
 
   void AddText(const wxString& string);
 

-  inline wxPen *GetPen() const { return m_pen; }
-  inline wxBrush *GetBrush() const { return m_brush; }
+  inline const wxPen *GetPen() const { return m_pen; }
+  inline const wxBrush *GetBrush() const { return m_brush; }

 
   /*
    * Region-specific functions (defaults to the default region
 
   /*
    * Region-specific functions (defaults to the default region


@@ -527,8 +527,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;
   double                m_xpos, m_ypos;
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;
   double                m_xpos, m_ypos;

-  wxPen*                m_pen;
-  wxBrush*              m_brush;
+  const wxPen*          m_pen;
+  const wxBrush*        m_brush;

   wxFont*               m_font;
   wxColour              m_textColour;
   wxString              m_textColourName;
   wxFont*               m_font;
   wxColour              m_textColour;
   wxString              m_textColourName;


@@ -558,7 +558,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   wxShape*              m_parent;      // In case it's a child
   int                   m_formatMode;
   int                   m_shadowMode;
   wxShape*              m_parent;      // In case it's a child
   int                   m_formatMode;
   int                   m_shadowMode;

-  wxBrush*              m_shadowBrush;
+  const wxBrush*        m_shadowBrush;

   int                   m_shadowOffsetX;
   int                   m_shadowOffsetY;
   int                   m_textMarginX;    // Gap between text and border
   int                   m_shadowOffsetX;
   int                   m_shadowOffsetY;
   int                   m_textMarginX;    // Gap between text and border