X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67d54b58cb92e83364b39c7534079c3699b9b6ea..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/contrib/include/wx/ogl/basic.h?ds=sidebyside diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h index d447693dfa..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; } @@ -520,9 +518,6 @@ class wxShape: public wxShapeEvtHandler wxBrush GetBackgroundBrush(); - private: - wxObject* m_clientData; - protected: wxShapeEvtHandler* m_eventHandler; bool m_formatted;