compilation fix

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

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index d447693dfaa134376cf4ca0413f6ac4ef06a783a..1288c3c057a3bb673d123281c8f113a463885041 100644 (file)
--- 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)
 
 {
  DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)
 


@@ -299,8 +299,6 @@ class wxShape: public wxShapeEvtHandler
 
   void SetPen(wxPen *pen);
   void SetBrush(wxBrush *brush);
 
   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; }
 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }


@@ -520,9 +518,6 @@ class wxShape: public wxShapeEvtHandler
   wxBrush GetBackgroundBrush();
 
 
   wxBrush GetBackgroundBrush();
 
 

- private:
-  wxObject*             m_clientData;
-

  protected:
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;
  protected:
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;