More build fixes

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

diff --git a/wxPython/src/clip_dnd.i b/wxPython/src/clip_dnd.i
index d61d0227c8bf50c74bdee580ae72513c032e04b6..0fe784009d076b7f63ef79efe36e31f16618f8d9 100644 (file)
--- a/wxPython/src/clip_dnd.i
+++ b/wxPython/src/clip_dnd.i
@@ -420,8 +420,14 @@ public:
 
 
 %readonly
 
 
 %readonly

+%{
+#if 0
+%}

 // See also wxPy_ReinitStockObjects in helpers.cpp
 extern wxClipboard* wxTheClipboard;
 // See also wxPy_ReinitStockObjects in helpers.cpp
 extern wxClipboard* wxTheClipboard;

+%{
+#endif
+%}

 %readwrite
 
 //----------------------------------------------------------------------
 %readwrite
 
 //----------------------------------------------------------------------

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 97e1b99eb386bc50dbcaff2cef20d204744a2e49..47081cb1cb6a503a9a52d86c676ad1bb3176205d 100644 (file)
--- 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);
 
 #ifdef __WXMSW__
 bool wxCheckForInterrupt(wxWindow *wnd);

-void wxFlushEvents();
+// link error? void wxFlushEvents();

 #endif
 
 wxWindow* wxGetTopLevelParent(wxWindow *win);
 #endif
 
 wxWindow* wxGetTopLevelParent(wxWindow *win);

diff --git a/wxPython/src/msw/clip_dnd.cpp b/wxPython/src/msw/clip_dnd.cpp
index 1aa9f493a9045408d80d16112568e2f1e1b89637..9a4fceba93ba1283c5f81dd1489077d47a24914c 100644 (file)
--- 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 <wx/metafile.h>
 }
 
 #include <wx/metafile.h>

+
+#if 0

 extern wxClipboard * wxTheClipboard; 
 
 extern wxClipboard * wxTheClipboard; 
 

+#endif
+

 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__
 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__

diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp
index 24cd2b5e941d30ea1fe1b40c5d3cd81ef3a78bb0..52294bf3d4fbda42b3fe8807064390e3ad954889 100644 (file)
--- 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;
 }
 
     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;
 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 },
         { "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 },
         { "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 d08fcf5b73eed749e99a976fa5513d206a816b58..da23e559ee98f113d87a657defcffab8158b5823 100644 (file)
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/misc2.py
@@ -1243,8 +1243,6 @@ def wxFindWindowAtPoint(*_args, **_kwargs):
 
 wxCheckForInterrupt = misc2c.wxCheckForInterrupt
 
 
 wxCheckForInterrupt = misc2c.wxCheckForInterrupt
 

-wxFlushEvents = misc2c.wxFlushEvents
-

 def wxGetTopLevelParent(*_args, **_kwargs):
     val = misc2c.wxGetTopLevelParent(*_args,**_kwargs)
     return val
 def wxGetTopLevelParent(*_args, **_kwargs):
     val = misc2c.wxGetTopLevelParent(*_args,**_kwargs)
     return val