Changes needed to solve wxPython's OOR problem for the wxOGL shapes.

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

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 46d04e9f606cee5dcaf864dd1674b4d1d0083bf6..318d202842d2603b3b229fbecc7e7a505a832bb3 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -65,7 +65,8 @@ PyObject* wxPyConstructObject(void* ptr,
                               PyObject* klass,
                               int setThisOwn=0);
 PyObject*  wxPyClassExists(const char* className);
                               PyObject* klass,
                               int setThisOwn=0);
 PyObject*  wxPyClassExists(const char* className);

-PyObject*  wxPyMake_wxObject(wxObject* source);
+PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
+PyObject*  wxPyMake_wxSizer(wxSizer* source);

 void       wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
 
 PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
 void       wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
 
 PyObject* wxPy_ConvertList(wxListBase* list, const char* className);


@@ -134,6 +135,7 @@ wxPoint* wxPoint_LIST_helper(PyObject* source, int* npoints);
 wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 wxString* wxString_LIST_helper(PyObject* source);
 wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 wxString* wxString_LIST_helper(PyObject* source);
 wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);

+wxPen** wxPen_LIST_helper(PyObject* source);

 
 bool wxSize_helper(PyObject* source, wxSize** obj);
 bool wxPoint_helper(PyObject* source, wxPoint** obj);
 
 bool wxSize_helper(PyObject* source, wxSize** obj);
 bool wxPoint_helper(PyObject* source, wxPoint** obj);


@@ -141,6 +143,20 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj);
 bool wxRect_helper(PyObject* source, wxRect** obj);
 bool wxColour_helper(PyObject* source, wxColour** obj);
 
 bool wxRect_helper(PyObject* source, wxRect** obj);
 bool wxColour_helper(PyObject* source, wxColour** obj);
 

+#if PYTHON_API_VERSION < 1009
+#define PySequence_Fast_GET_ITEM(o, i) \
+     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
+#endif
+
+bool _2int_seq_helper(PyObject* source, int* i1, int* i2);
+bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
+
+
+PyObject* wxArrayString2PyList_helper(const wxArrayString& app);
+
+
+#define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }
+

 //----------------------------------------------------------------------
 
 #ifndef SWIGCODE
 //----------------------------------------------------------------------
 
 #ifndef SWIGCODE


@@ -204,22 +220,24 @@ protected:
 
 
 class wxPyEvent : public wxEvent, public wxPyEvtSelfRef {
 
 
 class wxPyEvent : public wxEvent, public wxPyEvtSelfRef {

-    DECLARE_DYNAMIC_CLASS(wxPyEvent)
+    DECLARE_ABSTRACT_CLASS(wxPyEvent)

 public:
     wxPyEvent(int id=0);
 public:
     wxPyEvent(int id=0);

+    wxPyEvent(const wxPyEvent& evt);

     ~wxPyEvent();
 
     ~wxPyEvent();
 

-    void CopyObject(wxObject& dest) const;
+    virtual wxEvent* Clone() const { return new wxPyEvent(*this); }

 };
 
 
 class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef {
 };
 
 
 class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef {

-    DECLARE_DYNAMIC_CLASS(wxPyCommandEvent)
+    DECLARE_ABSTRACT_CLASS(wxPyCommandEvent)

 public:
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
 public:
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);

+    wxPyCommandEvent(const wxPyCommandEvent& evt);

     ~wxPyCommandEvent();
 
     ~wxPyCommandEvent();
 

-    void CopyObject(wxObject& dest) const;
+    virtual wxEvent* Clone() const { return new wxPyCommandEvent(*this); }

 };
 
 
 };
 
 


@@ -260,14 +278,15 @@ struct wxPyCoreAPI {
     bool        (*p_wxRect_helper)(PyObject* source, wxRect** obj);
     bool        (*p_wxColour_helper)(PyObject* source, wxColour** obj);
 
     bool        (*p_wxRect_helper)(PyObject* source, wxRect** obj);
     bool        (*p_wxColour_helper)(PyObject* source, wxColour** obj);
 

-    void        (*p_wxPyCBH_setSelf)(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);
+    void        (*p_wxPyCBH_setCallbackInfo)(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);

     bool        (*p_wxPyCBH_findCallback)(const wxPyCallbackHelper& cbh, const char* name);
     int         (*p_wxPyCBH_callCallback)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     PyObject*   (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 
     PyObject*   (*p_wxPyClassExists)(const char* className);
     bool        (*p_wxPyCBH_findCallback)(const wxPyCallbackHelper& cbh, const char* name);
     int         (*p_wxPyCBH_callCallback)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     PyObject*   (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
     void        (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
 
     PyObject*   (*p_wxPyClassExists)(const char* className);

-    PyObject*   (*p_wxPyMake_wxObject)(wxObject* source);
+    PyObject*   (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler);
+    PyObject*   (*p_wxPyMake_wxSizer)(wxSizer* source);

     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
 
 };
     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
 
 };


@@ -318,7 +337,7 @@ private:
 };
 
 
 };
 
 

-void wxPyCBH_setSelf(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);
+void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref);

 bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name);
 int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple);
 PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTuple);
 bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name);
 int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple);
 PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTuple);


@@ -381,8 +400,8 @@ public:
 //---------------------------------------------------------------------------
 
 #define PYPRIVATE                                                       \
 //---------------------------------------------------------------------------
 
 #define PYPRIVATE                                                       \

-    void _setSelf(PyObject* self, PyObject* _class, int incref=1) {     \
-        wxPyCBH_setSelf(m_myInst, self, _class, incref);                \
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1) {     \
+        wxPyCBH_setCallbackInfo(m_myInst, self, _class, incref);                \

     }                                                                   \
     private: wxPyCallbackHelper m_myInst
 
     }                                                                   \
     private: wxPyCallbackHelper m_myInst
 


@@ -1020,6 +1039,58 @@ public:
         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 

+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__CELLINTINT(CBNAME)                                      \
+    void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y);                        \
+    void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y);
+
+#define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME)                       \
+    void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {                \
+        wxString rval;                                                          \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
+            wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y));  \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(cell, x, y);                                         \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) {         \
+        PCLASS::CBNAME(cell, x, y);                                             \
+    }
+
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__CELLINTINTME(CBNAME)                                    \
+    void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e); \
+    void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e);
+
+#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME)                       \
+    void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {                \
+        bool found;                                                             \
+        wxPyTState* state = wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0);  \
+            PyObject* o2  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0);  \
+            wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2));  \
+            Py_DECREF(obj);                                                     \
+            Py_DECREF(o2);                                                      \
+        }                                                                       \
+        wxPyEndBlockThreads(state);                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(cell, x, y, e);                                         \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {         \
+        PCLASS::CBNAME(cell, x, y, e);                                             \
+    }
+
+
+

 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK___pure(CBNAME)                         \
 //---------------------------------------------------------------------------
 
 #define DEC_PYCALLBACK___pure(CBNAME)                         \


@@ -1321,7 +1392,7 @@ public:
 
 #define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type)                    \
     bool CLASS::CBNAME(Type& a) {                                               \
 
 #define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type)                    \
     bool CLASS::CBNAME(Type& a) {                                               \

-        bool rv;                                                                \
+        bool rv=FALSE;                                                          \

         bool found;                                                             \
         wxPyTState* state = wxPyBeginBlockThreads();                            \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
         bool found;                                                             \
         wxPyTState* state = wxPyBeginBlockThreads();                            \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \


@@ -1431,4 +1502,35 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \
+    bool CBNAME(wxMouseEvent& e); \
+    bool base_##CBNAME(wxMouseEvent& e);
+
+#define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \
+    bool CLASS::CBNAME(wxMouseEvent& e) { \
+        bool rval=FALSE; \
+        bool found; \
+        wxPyTState* state = wxPyBeginBlockThreads(); \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+            PyObject* ro; \
+            PyObject* obj  = wxPyConstructObject((void*)&e, "wxMouseEvent", 0);  \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj));  \
+            if (ro) { \
+                rval = PyInt_AsLong(ro); \
+                Py_DECREF(ro); \
+            } \
+            Py_DECREF(obj); \
+        } \
+        wxPyEndBlockThreads(state); \
+        if (! found) \
+            return PCLASS::CBNAME(e); \
+        return rval; \
+    } \
+    bool CLASS::base_##CBNAME(wxMouseEvent& e) { \
+        return PCLASS::CBNAME(e); \
+    }
+
+
+//---------------------------------------------------------------------------
+

 #endif
 #endif