reSWIGged

[wxWidgets.git] / wxPython / src / msw / clip_dnd.cpp

diff --git a/wxPython/src/msw/clip_dnd.cpp b/wxPython/src/msw/clip_dnd.cpp
index 5befae339dc9c0d961196eeb38550aae4387fef6..9a4fceba93ba1283c5f81dd1489077d47a24914c 100644 (file)
--- a/wxPython/src/msw/clip_dnd.cpp
+++ b/wxPython/src/msw/clip_dnd.cpp
@@ -199,8 +199,10 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
 
 #include <wx/metafile.h>
 
-    // See below in the init function...
-    wxClipboard* wxPyTheClipboard;
+#if 0
+extern wxClipboard * wxTheClipboard; 
+
+#endif
 
 class wxPyDropSource : public wxDropSource {
 public:
@@ -366,17 +368,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;
 }
@@ -3834,7 +3836,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));
@@ -3846,7 +3848,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");