X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..da03e3303f63960ee75b4bfa7d1319f337a728fa:/contrib/include/wx/ogl/basic.h?ds=inline diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h index 9c52020c85..1288c3c057 100644 --- a/contrib/include/wx/ogl/basic.h +++ b/contrib/include/wx/ogl/basic.h @@ -124,7 +124,7 @@ class WXDLLEXPORT wxExprDatabase; -class wxShapeEvtHandler: public wxObject +class wxShapeEvtHandler: public wxObject, public wxClientDataContainer { DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler) @@ -299,8 +299,6 @@ class wxShape: public wxShapeEvtHandler void SetPen(wxPen *pen); void SetBrush(wxBrush *brush); - inline void SetClientData(wxObject *client_data) { m_clientData = client_data; }; - inline wxObject *GetClientData() const { return m_clientData; }; virtual void Show(bool show); virtual bool IsShown() const { return m_visible; } @@ -515,8 +513,10 @@ class wxShape: public wxShapeEvtHandler // Clears points from a list of wxRealPoints void ClearPointList(wxList& list); - private: - wxObject* m_clientData; + // Return pen or brush of the right colour for the background + wxPen GetBackgroundPen(); + wxBrush GetBackgroundBrush(); + protected: wxShapeEvtHandler* m_eventHandler;