revert return type changes for gdi object pointers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index 0360f19c9ead5523fbd288aef6f38b0efc8bb8c8..c0db18d8f4d1d8a4435df8f40978d2189938867d 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -329,8 +329,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
 
   void AddText(const wxString& string);
 
-  inline const wxPen *GetPen() const { return m_pen; }
-  inline const wxBrush *GetBrush() const { return m_brush; }
+  inline wxPen *GetPen() const { return wx_const_cast(wxPen*, m_pen); }
+  inline wxBrush *GetBrush() const { return wx_const_cast(wxBrush*, m_brush); }
 
   /*
    * Region-specific functions (defaults to the default region

diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h
index 404763fe54916417583ca6a9ab6557c8256b89be..68a2c400a284963208b9ee497d3bf42b7000433e 100644 (file)
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -188,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 const wxPen *GetLeftSidePen() const { return m_leftSidePen; }
-  inline void SetTopSidePen(wxPen *pen) { m_topSidePen = pen; }
-  inline const 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);

diff --git a/contrib/include/wx/ogl/drawn.h b/contrib/include/wx/ogl/drawn.h
index f90f541089d7e6c4aa943939aee91f0c298d9aed..0df56399a2d2360db6927b6df9279959af0dbd37 100644 (file)
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -57,11 +57,11 @@ class WXDLLIMPEXP_OGL wxPseudoMetaFile: public wxObject
 
   inline void SetSize(double w, double h) { m_width = w; m_height = h; }
 
-  inline void SetFillBrush(wxBrush* brush) { m_fillBrush = brush; }
-  inline const wxBrush* GetFillBrush() const { return m_fillBrush; }
+  inline void SetFillBrush(const wxBrush* brush) { m_fillBrush = brush; }
+  inline wxBrush* GetFillBrush() const { return wx_const_cast(wxBrush*, m_fillBrush); }
 
-  inline void SetOutlinePen(wxPen* pen) { m_outlinePen = pen; }
-  inline const wxPen* GetOutlinePen() const { return m_outlinePen; }
+  inline void SetOutlinePen(const wxPen* pen) { m_outlinePen = pen; }
+  inline wxPen* GetOutlinePen() const { return wx_const_cast(wxPen*, m_outlinePen); }
 
   inline void SetOutlineOp(int op) { m_outlineOp = op; }
   inline int GetOutlineOp() const { return m_outlineOp; }