X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ba06d5a8ccf8c224fcfbd52fa01a55abf7befbd..e56f4f9e90696fed39677c3410cb18562dcf0ad2:/contrib/include/wx/ogl/composit.h diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h index d81865b8ed..404763fe54 100644 --- 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; @@ -193,9 +189,9 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape inline int GetHandleSide() const { return m_handleSide; } inline void SetLeftSidePen(wxPen *pen) { m_leftSidePen = pen; } - inline wxPen *GetLeftSidePen() const { return m_leftSidePen; } + inline const wxPen *GetLeftSidePen() const { return m_leftSidePen; } inline void SetTopSidePen(wxPen *pen) { m_topSidePen = pen; } - inline wxPen *GetTopSidePen() const { return m_topSidePen; } + inline const wxPen *GetTopSidePen() const { return 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;