Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-26 00:21:37 +00:00
parent 3e46a8e623
commit 18d95cf07f
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/src/clip_dnd.i
View File

@@ -420,8 +420,14 @@ public:
%readonly %readonly
%{
#if 0
%}
// See also wxPy_ReinitStockObjects in helpers.cpp // See also wxPy_ReinitStockObjects in helpers.cpp
extern wxClipboard* wxTheClipboard; extern wxClipboard* wxTheClipboard;
%{
#endif
%}
%readwrite %readwrite
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
wxPython/src/misc2.i
View File

@@ -175,7 +175,7 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
#ifdef __WXMSW__ #ifdef __WXMSW__
bool wxCheckForInterrupt(wxWindow *wnd); bool wxCheckForInterrupt(wxWindow *wnd);
void wxFlushEvents(); // link error? void wxFlushEvents();
#endif #endif
wxWindow* wxGetTopLevelParent(wxWindow *win); wxWindow* wxGetTopLevelParent(wxWindow *win);

4
wxPython/src/msw/clip_dnd.cpp
View File

@@ -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 { class wxPyDropSource : public wxDropSource {
public: public:
#ifndef __WXGTK__ #ifndef __WXGTK__

19
wxPython/src/msw/misc2.cpp
View File

@@ -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) { static PyObject *_wrap_wxGetTopLevelParent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxWindow * _result; wxWindow * _result;
@@ -11562,7 +11544,6 @@ static PyMethodDef misc2cMethods[] = {
{ "wxCaret_SetBlinkTime", (PyCFunction) _wrap_wxCaret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_SetBlinkTime", (PyCFunction) _wrap_wxCaret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS },
{ "wxCaret_GetBlinkTime", (PyCFunction) _wrap_wxCaret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_GetBlinkTime", (PyCFunction) _wrap_wxCaret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS },
{ "wxGetTopLevelParent", (PyCFunction) _wrap_wxGetTopLevelParent, 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 }, { "wxCheckForInterrupt", (PyCFunction) _wrap_wxCheckForInterrupt, METH_VARARGS | METH_KEYWORDS },
{ "wxFindWindowAtPoint", (PyCFunction) _wrap_wxFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { "wxFindWindowAtPoint", (PyCFunction) _wrap_wxFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
{ "wxGenericFindWindowAtPoint", (PyCFunction) _wrap_wxGenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { "wxGenericFindWindowAtPoint", (PyCFunction) _wrap_wxGenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },

2
wxPython/src/msw/misc2.py
View File

@@ -1243,8 +1243,6 @@ def wxFindWindowAtPoint(*_args, **_kwargs):
wxCheckForInterrupt = misc2c.wxCheckForInterrupt wxCheckForInterrupt = misc2c.wxCheckForInterrupt
wxFlushEvents = misc2c.wxFlushEvents
def wxGetTopLevelParent(*_args, **_kwargs): def wxGetTopLevelParent(*_args, **_kwargs):
val = misc2c.wxGetTopLevelParent(*_args,**_kwargs) val = misc2c.wxGetTopLevelParent(*_args,**_kwargs)
return val return val