Removed m_clientData and related methods as it's now handled by the

wxClientDataContainer mixin.

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

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index 1127a23ef2a82c85b90f3381ecfd4a4e6526fa8c..1288c3c057a3bb673d123281c8f113a463885041 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -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;

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 29e50b9c9320bf882ee6c1c19f2914825459b1bb..b7cce422e404d84ae62551678fc733e67e3e4537 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -288,7 +288,6 @@ wxShape::wxShape(wxShapeCanvas *can)
   m_textColour = wxBLACK;
   m_textColourName = "BLACK";
   m_visible = FALSE;
   m_textColour = wxBLACK;
   m_textColourName = "BLACK";
   m_visible = FALSE;

-  m_clientData = NULL;

   m_selected = FALSE;
   m_attachmentMode = ATTACHMENT_MODE_NONE;
   m_spaceAttachments = TRUE;
   m_selected = FALSE;
   m_attachmentMode = ATTACHMENT_MODE_NONE;
   m_spaceAttachments = TRUE;


@@ -338,11 +337,6 @@ wxShape::~wxShape()
   if (m_canvas)
     m_canvas->RemoveShape(this);
 
   if (m_canvas)
     m_canvas->RemoveShape(this);
 

-  if (m_clientData) {
-      delete m_clientData;
-      m_clientData = NULL;
-  }
-

   GetEventHandler()->OnDelete();
 }
 
   GetEventHandler()->OnDelete();
 }
 

diff --git a/wxPython/contrib/ogl/oglbasic.i b/wxPython/contrib/ogl/oglbasic.i
index 7e982eeb31f768da0b22557bc411c04897dd1d95..c1f6c8301468344739409936a7f06c4a121e4f2a 100644 (file)
--- a/wxPython/contrib/ogl/oglbasic.i
+++ b/wxPython/contrib/ogl/oglbasic.i
@@ -240,25 +240,17 @@ public:
 
     // void SetClientData(wxObject *client_data);
     // wxObject *GetClientData();
 
     // void SetClientData(wxObject *client_data);
     // wxObject *GetClientData();

-    %addmethods {
-        void SetClientData(PyObject* userData) {
-            wxPyUserData* data = NULL;
-            if (userData)
-                data = new wxPyUserData(userData);
-            self->SetClientData(data);
-        }

 
 

-        PyObject* GetClientData() {
-            wxPyUserData* data = (wxPyUserData*)self->GetClientData();
-            if (data) {
-                Py_INCREF(data->m_obj);
-                return data->m_obj;
-            } else {
-                Py_INCREF(Py_None);
-                return Py_None;
-            }
-        }
-    }
+    // The real client data methods are being used for OOR, so just fake it.
+    %pragma(python) addtoclass = "
+    def SetClientData(self, data):
+        self.clientData = data
+    def GetClientData(self):
+        if hasattr(self, 'clientData'):
+            return self.clientData
+        else:
+            return None
+"

 
     void Show(bool show);
     bool IsShown();
 
     void Show(bool show);
     bool IsShown();