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

wxDF_HTML and FloodFill interface updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-04-18 05:42:09 +00:00
parent 33ff77f695
commit d394edcac8
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wxPython/src/clip_dnd.i
View File

@@ -45,25 +45,26 @@
enum wxDataFormatId enum wxDataFormatId
{ {
wxDF_INVALID = 0, wxDF_INVALID,
wxDF_TEXT = 1, /* CF_TEXT */ wxDF_TEXT,
wxDF_BITMAP = 2, /* CF_BITMAP */ wxDF_BITMAP,
wxDF_METAFILE = 3, /* CF_METAFILEPICT */ wxDF_METAFILE,
wxDF_SYLK = 4, wxDF_SYLK,
wxDF_DIF = 5, wxDF_DIF,
wxDF_TIFF = 6, wxDF_TIFF,
wxDF_OEMTEXT = 7, /* CF_OEMTEXT */ wxDF_OEMTEXT,
wxDF_DIB = 8, /* CF_DIB */ wxDF_DIB,
wxDF_PALETTE = 9, wxDF_PALETTE,
wxDF_PENDATA = 10, wxDF_PENDATA,
wxDF_RIFF = 11, wxDF_RIFF,
wxDF_WAVE = 12, wxDF_WAVE,
wxDF_UNICODETEXT = 13, wxDF_UNICODETEXT,
wxDF_ENHMETAFILE = 14, wxDF_ENHMETAFILE,
wxDF_FILENAME = 15, /* CF_HDROP */ wxDF_FILENAME,
wxDF_LOCALE = 16, wxDF_LOCALE,
wxDF_PRIVATE = 20, wxDF_PRIVATE,
wxDF_MAX wxDF_HTML,
wxDF_MAX,
}; };
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
wxPython/src/gdi.i
View File

@@ -578,7 +578,7 @@ public:
void EndDoc(); void EndDoc();
void EndDrawing(); void EndDrawing();
void EndPage(); void EndPage();
void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE); bool FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE);
wxBrush GetBackground(); wxBrush GetBackground();
wxBrush GetBrush(); wxBrush GetBrush();
long GetCharHeight(); long GetCharHeight();

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

@@ -3846,6 +3846,7 @@ SWIGEXPORT(void) initclip_dndc() {
PyDict_SetItemString(d,"wxDF_FILENAME", PyInt_FromLong((long) wxDF_FILENAME)); PyDict_SetItemString(d,"wxDF_FILENAME", PyInt_FromLong((long) wxDF_FILENAME));
PyDict_SetItemString(d,"wxDF_LOCALE", PyInt_FromLong((long) wxDF_LOCALE)); PyDict_SetItemString(d,"wxDF_LOCALE", PyInt_FromLong((long) wxDF_LOCALE));
PyDict_SetItemString(d,"wxDF_PRIVATE", PyInt_FromLong((long) wxDF_PRIVATE)); PyDict_SetItemString(d,"wxDF_PRIVATE", PyInt_FromLong((long) wxDF_PRIVATE));
PyDict_SetItemString(d,"wxDF_HTML", PyInt_FromLong((long) wxDF_HTML));
PyDict_SetItemString(d,"wxDF_MAX", PyInt_FromLong((long) wxDF_MAX)); PyDict_SetItemString(d,"wxDF_MAX", PyInt_FromLong((long) wxDF_MAX));
PyDict_SetItemString(d,"cvar", SWIG_globals); PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxFormatInvalid",_wrap_wxPyFormatInvalid_get, _wrap_wxPyFormatInvalid_set); SWIG_addvarlink(SWIG_globals,"wxFormatInvalid",_wrap_wxPyFormatInvalid_get, _wrap_wxPyFormatInvalid_set);

1
wxPython/src/msw/clip_dnd.py
View File

@@ -540,6 +540,7 @@ wxDF_ENHMETAFILE = clip_dndc.wxDF_ENHMETAFILE
wxDF_FILENAME = clip_dndc.wxDF_FILENAME wxDF_FILENAME = clip_dndc.wxDF_FILENAME
wxDF_LOCALE = clip_dndc.wxDF_LOCALE wxDF_LOCALE = clip_dndc.wxDF_LOCALE
wxDF_PRIVATE = clip_dndc.wxDF_PRIVATE wxDF_PRIVATE = clip_dndc.wxDF_PRIVATE
wxDF_HTML = clip_dndc.wxDF_HTML
wxDF_MAX = clip_dndc.wxDF_MAX wxDF_MAX = clip_dndc.wxDF_MAX
cvar = clip_dndc.cvar cvar = clip_dndc.cvar
wxFormatInvalid = wxDataFormatPtr(clip_dndc.cvar.wxFormatInvalid) wxFormatInvalid = wxDataFormatPtr(clip_dndc.cvar.wxFormatInvalid)

6
wxPython/src/msw/gdi.cpp
View File

@@ -6087,6 +6087,7 @@ static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args, PyObject *kw
#define wxDC_FloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->FloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) #define wxDC_FloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->FloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
bool _result;
wxDC * _arg0; wxDC * _arg0;
long _arg1; long _arg1;
long _arg2; long _arg2;
@@ -6114,12 +6115,11 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args, PyObject *
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDC_FloodFill(_arg0,_arg1,_arg2,*_arg3,_arg4); _result = (bool )wxDC_FloodFill(_arg0,_arg1,_arg2,*_arg3,_arg4);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None); } _resultobj = Py_BuildValue("i",_result);
_resultobj = Py_None;
return _resultobj; return _resultobj;
} }