X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..6e4d60a3b843bcd23d2b65d426fd511f8d10f97a:/wxPython/src/clip_dnd.i?ds=sidebyside

diff --git a/wxPython/src/clip_dnd.i b/wxPython/src/clip_dnd.i
index e5547215f4..0fe784009d 100644
--- a/wxPython/src/clip_dnd.i
+++ b/wxPython/src/clip_dnd.i
@@ -418,12 +418,16 @@ public:
     void UsePrimarySelection( int primary = FALSE );
 };
 
+
+%readonly
 %{
-    // See below in the init function...
-    wxClipboard* wxPyTheClipboard;
+#if 0
+%}
+// See also wxPy_ReinitStockObjects in helpers.cpp
+extern wxClipboard* wxTheClipboard;
+%{
+#endif
 %}
-%readonly
-%name(wxTheClipboard) wxClipboard* wxPyTheClipboard;
 %readwrite
 
 //----------------------------------------------------------------------
@@ -454,7 +458,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 +484,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 +678,6 @@ public:
 
 %init %{
 
-    wxPyTheClipboard = wxTheClipboard;
     wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
     wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
     wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");