From 18d95cf07f67c662ae1ab4952dce9b447f12504e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 26 Jul 2003 00:21:37 +0000 Subject: [PATCH] More build fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/clip_dnd.i | 6 ++++++ wxPython/src/misc2.i | 2 +- wxPython/src/msw/clip_dnd.cpp | 4 ++++ wxPython/src/msw/misc2.cpp | 19 ------------------- wxPython/src/msw/misc2.py | 2 -- 5 files changed, 11 insertions(+), 22 deletions(-) diff --git a/wxPython/src/clip_dnd.i b/wxPython/src/clip_dnd.i index d61d0227c8..0fe784009d 100644 --- a/wxPython/src/clip_dnd.i +++ b/wxPython/src/clip_dnd.i @@ -420,8 +420,14 @@ public: %readonly +%{ +#if 0 +%} // See also wxPy_ReinitStockObjects in helpers.cpp extern wxClipboard* wxTheClipboard; +%{ +#endif +%} %readwrite //---------------------------------------------------------------------- diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index 97e1b99eb3..47081cb1cb 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -175,7 +175,7 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt); #ifdef __WXMSW__ bool wxCheckForInterrupt(wxWindow *wnd); -void wxFlushEvents(); +// link error? void wxFlushEvents(); #endif wxWindow* wxGetTopLevelParent(wxWindow *win); diff --git a/wxPython/src/msw/clip_dnd.cpp b/wxPython/src/msw/clip_dnd.cpp index 1aa9f493a9..9a4fceba93 100644 --- a/wxPython/src/msw/clip_dnd.cpp +++ b/wxPython/src/msw/clip_dnd.cpp @@ -198,8 +198,12 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { } #include + +#if 0 extern wxClipboard * wxTheClipboard; +#endif + class wxPyDropSource : public wxDropSource { public: #ifndef __WXGTK__ diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index 24cd2b5e94..52294bf3d4 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/misc2.cpp @@ -1460,24 +1460,6 @@ static PyObject *_wrap_wxCheckForInterrupt(PyObject *self, PyObject *args, PyObj return _resultobj; } -static PyObject *_wrap_wxFlushEvents(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - char *_kwnames[] = { NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFlushEvents",_kwnames)) - return NULL; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxFlushEvents(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - static PyObject *_wrap_wxGetTopLevelParent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxWindow * _result; @@ -11562,7 +11544,6 @@ static PyMethodDef misc2cMethods[] = { { "wxCaret_SetBlinkTime", (PyCFunction) _wrap_wxCaret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_GetBlinkTime", (PyCFunction) _wrap_wxCaret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS }, { "wxGetTopLevelParent", (PyCFunction) _wrap_wxGetTopLevelParent, METH_VARARGS | METH_KEYWORDS }, - { "wxFlushEvents", (PyCFunction) _wrap_wxFlushEvents, METH_VARARGS | METH_KEYWORDS }, { "wxCheckForInterrupt", (PyCFunction) _wrap_wxCheckForInterrupt, METH_VARARGS | METH_KEYWORDS }, { "wxFindWindowAtPoint", (PyCFunction) _wrap_wxFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { "wxGenericFindWindowAtPoint", (PyCFunction) _wrap_wxGenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py index d08fcf5b73..da23e559ee 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -1243,8 +1243,6 @@ def wxFindWindowAtPoint(*_args, **_kwargs): wxCheckForInterrupt = misc2c.wxCheckForInterrupt -wxFlushEvents = misc2c.wxFlushEvents - def wxGetTopLevelParent(*_args, **_kwargs): val = misc2c.wxGetTopLevelParent(*_args,**_kwargs) return val