Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h
index d81865b8ed8d1b2b0c17c3e53bf3e39d909a11ad..68a2c400a284963208b9ee497d3bf42b7000433e 100644 (file)
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -12,10 +12,6 @@
 #ifndef _OGL_COMPOSIT_H_
 #define _OGL_COMPOSIT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "composit.h"
-#endif
-
 
 class WXDLLIMPEXP_OGL wxDivisionShape;
 class WXDLLIMPEXP_OGL wxOGLConstraint;
@@ -192,10 +188,10 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
   inline void SetHandleSide(int side) { m_handleSide = side; }
   inline int GetHandleSide() const { return m_handleSide; }
 
-  inline void SetLeftSidePen(wxPen *pen) { m_leftSidePen = pen; }
-  inline wxPen *GetLeftSidePen() const { return m_leftSidePen; }
-  inline void SetTopSidePen(wxPen *pen) { m_topSidePen = pen; }
-  inline wxPen *GetTopSidePen() const { return m_topSidePen; }
+  inline void SetLeftSidePen(const wxPen *pen) { m_leftSidePen = pen; }
+  inline wxPen *GetLeftSidePen() const { return wx_const_cast(wxPen*, m_leftSidePen); }
+  inline void SetTopSidePen(const wxPen *pen) { m_topSidePen = pen; }
+  inline wxPen *GetTopSidePen() const { return wx_const_cast(wxPen*, m_topSidePen); }
 
   void SetLeftSideColour(const wxString& colour);
   void SetTopSideColour(const wxString& colour);
@@ -218,8 +214,8 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
 
   int                   m_handleSide;       // Side at which handle is legal
 
-  wxPen*                m_leftSidePen;
-  wxPen*                m_topSidePen;
+  const wxPen*          m_leftSidePen;
+  const wxPen*          m_topSidePen;
   wxString              m_leftSideColour;
   wxString              m_topSideColour;
   wxString              m_leftSideStyle;