fine-tuned API from the ICO patch

[wxWidgets.git] / wxPython / src / helpers.cpp

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index e485a2f8176d9c2d779cea6d38dc1cc9adccff83..9c4cb6ecdaacf3ef43843ffe41a52664a51e4601 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -101,7 +101,6 @@ void WXDLLEXPORT wxEntryCleanup();
 
 
 #ifdef WXP_WITH_THREAD
 
 
 #ifdef WXP_WITH_THREAD

-//PyThreadState*  wxPyEventThreadState = NULL;

 PyInterpreterState* wxPyInterpreter = NULL;
 #endif
 
 PyInterpreterState* wxPyInterpreter = NULL;
 #endif
 


@@ -118,7 +117,6 @@ void __wxPreStart()
 
 #ifdef WXP_WITH_THREAD
     PyEval_InitThreads();
 
 #ifdef WXP_WITH_THREAD
     PyEval_InitThreads();

-//    wxPyEventThreadState = PyThreadState_Get(); // PyThreadState_New(PyThreadState_Get()->interp);

     wxPyInterpreter = PyThreadState_Get()->interp;
 #endif
 
     wxPyInterpreter = PyThreadState_Get()->interp;
 #endif
 


@@ -632,37 +630,41 @@ PyObject* wxPyEvtSelfRef::GetSelf() const {
 }
 
 
 }
 
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyEvent, wxEvent);
+IMPLEMENT_ABSTRACT_CLASS(wxPyCommandEvent, wxCommandEvent);
+
+

 wxPyEvent::wxPyEvent(int id)
     : wxEvent(id) {
 }
 
 wxPyEvent::wxPyEvent(int id)
     : wxEvent(id) {
 }
 

-wxPyEvent::~wxPyEvent() {
-}

 
 

-// This one is so the event object can be Cloned...
-void wxPyEvent::CopyObject(wxObject& dest) const {
-    wxEvent::CopyObject(dest);
-    ((wxPyEvent*)&dest)->SetSelf(m_self, TRUE);
+wxPyEvent::wxPyEvent(const wxPyEvent& evt)
+    : wxEvent(evt)
+{
+    SetSelf(evt.m_self, TRUE);

 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent);
+wxPyEvent::~wxPyEvent() {
+}

 
 
 wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
     : wxCommandEvent(commandType, id) {
 }
 
 
 
 wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
     : wxCommandEvent(commandType, id) {
 }
 

-wxPyCommandEvent::~wxPyCommandEvent() {
-}

 
 

-void wxPyCommandEvent::CopyObject(wxObject& dest) const {
-    wxCommandEvent::CopyObject(dest);
-    ((wxPyCommandEvent*)&dest)->SetSelf(m_self, TRUE);
+wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt)
+    : wxCommandEvent(evt)
+{
+    SetSelf(evt.m_self, TRUE);

 }
 
 
 }
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent);
+wxPyCommandEvent::~wxPyCommandEvent() {
+}
+

 
 
 
 
 
 


@@ -1304,7 +1306,7 @@ PyObject* wxArrayString2PyList_helper(const wxArrayString& arr) {
     for (size_t i=0; i < arr.GetCount(); i++) {
         PyObject* str = PyString_FromString(arr[i].c_str());
         PyList_Append(list, str);
     for (size_t i=0; i < arr.GetCount(); i++) {
         PyObject* str = PyString_FromString(arr[i].c_str());
         PyList_Append(list, str);

-        // TODO:  Check refcount on str...
+        Py_DECREF(str);

     }
     return list;
 }
     }
     return list;
 }