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

Minimal changes needed to build/run wxPython on the 2.5 branch after

Browse Source 
the merge.  Still need to look for and apply most changes and new
additions that have happened since the last merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:26:53 +00:00
parent fd657b8a59
commit dd116e73f0
22 changed files with 1923 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wxPython/src/gtk/clip_dnd.cpp
View File

@@ -196,9 +196,7 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
}
wxPyEndBlockThreads();
}
// See below in the init function...
wxClipboard* wxPyTheClipboard;
extern wxClipboard * wxTheClipboard;
class wxPyDropSource : public wxDropSource {
public:
@@ -364,17 +362,17 @@ static PyObject *_wrap_wxPyFormatInvalid_get() {
return pyobj;
}
static int _wrap_wxPyTheClipboard_set(PyObject *val) {
static int _wrap_wxTheClipboard_set(PyObject *val) {
PyErr_SetString(PyExc_TypeError,"Variable wxTheClipboard is read-only.");
return 1;
}
static PyObject *_wrap_wxPyTheClipboard_get() {
static PyObject *_wrap_wxTheClipboard_get() {
PyObject * pyobj;
char ptemp[128];
SWIG_MakePtr(ptemp, (char *) wxPyTheClipboard,"_wxClipboard_p");
SWIG_MakePtr(ptemp, (char *) wxTheClipboard,"_wxClipboard_p");
pyobj = PyString_FromString(ptemp);
return pyobj;
}
@@ -3679,7 +3677,7 @@ SWIGEXPORT(void) initclip_dndc() {
PyDict_SetItemString(d,"wxDF_MAX", PyInt_FromLong((long) wxDF_MAX));
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxFormatInvalid",_wrap_wxPyFormatInvalid_get, _wrap_wxPyFormatInvalid_set);
SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxPyTheClipboard_get, _wrap_wxPyTheClipboard_set);
SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxTheClipboard_get, _wrap_wxTheClipboard_set);
PyDict_SetItemString(d,"wxDrag_CopyOnly", PyInt_FromLong((long) wxDrag_CopyOnly));
PyDict_SetItemString(d,"wxDrag_AllowMove", PyInt_FromLong((long) wxDrag_AllowMove));
PyDict_SetItemString(d,"wxDrag_DefaultMove", PyInt_FromLong((long) wxDrag_DefaultMove));
@@ -3691,7 +3689,6 @@ SWIGEXPORT(void) initclip_dndc() {
PyDict_SetItemString(d,"wxDragCancel", PyInt_FromLong((long) wxDragCancel));
wxPyTheClipboard = wxTheClipboard;
wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");