Lots of changes for wxPython to start using many of the new featues in

[wxWidgets.git] / wxPython / src / clip_dnd.i

diff --git a/wxPython/src/clip_dnd.i b/wxPython/src/clip_dnd.i
index e5547215f4ec7dbd92fee0b750ae53f3c4d2c8b3..d61d0227c8bf50c74bdee580ae72513c032e04b6 100644 (file)
--- a/wxPython/src/clip_dnd.i
+++ b/wxPython/src/clip_dnd.i
@@ -418,12 +418,10 @@ public:
     void UsePrimarySelection( int primary = FALSE );
 };
 
-%{
-    // See below in the init function...
-    wxClipboard* wxPyTheClipboard;
-%}
+
 %readonly
-%name(wxTheClipboard) wxClipboard* wxPyTheClipboard;
+// See also wxPy_ReinitStockObjects in helpers.cpp
+extern wxClipboard* wxTheClipboard;
 %readwrite
 
 //----------------------------------------------------------------------
@@ -454,7 +452,7 @@ bool wxIsDragResultOk(wxDragResult res);
 %{
 class wxPyDropSource : public wxDropSource {
 public:
-#ifdef __WXMSW__
+#ifndef __WXGTK__
      wxPyDropSource(wxWindow *win = NULL,
                     const wxCursor &copy = wxNullCursor,
                     const wxCursor &move = wxNullCursor,
@@ -480,7 +478,7 @@ IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 
 %name(wxDropSource) class wxPyDropSource {
 public:
-#ifdef __WXMSW__
+#ifndef __WXGTK__
      wxPyDropSource(wxWindow *win = NULL,
                     const wxCursor &copy = wxNullCursor,
                     const wxCursor &move = wxNullCursor,
@@ -674,7 +672,6 @@ public:
 
 %init %{
 
-    wxPyTheClipboard = wxTheClipboard;
     wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
     wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
     wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");