removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related...

[wxWidgets.git] / include / wx / gtk / dnd.h

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c2210c23a34f55f3408f3aaca4b1a8fd3970d16d..6f877727bc6703a6ae43b7123822f1ecf2484474 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -7,34 +7,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_DND_H_
+#define _WX_GTK_DND_H_
 
-#ifndef __GTKDNDH__
-#define __GTKDNDH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
 #include "wx/icon.h"
-#include "wx/gdicmn.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class wxWindow;
-
-class wxDropTarget;
-class wxTextDropTarget;
-class wxFileDropTarget;
-
-class wxDropSource;
 
 // ----------------------------------------------------------------------------
 // macros
@@ -50,7 +26,7 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
-class wxDropTarget: public wxDropTargetBase
+class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
 {
 public:
     wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
@@ -83,7 +59,7 @@ public:
 // wxDropSource
 //-------------------------------------------------------------------------
 
-class wxDropSource: public wxDropSourceBase
+class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
 {
 public:
     // constructor. set data later with SetData()
@@ -104,10 +80,6 @@ public:
     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
-    // GTK implementation
-    void RegisterWindow();
-    void UnregisterWindow();
-
     void PrepareIcon( int action, GdkDragContext *context );
 
     GtkWidget       *m_widget;
@@ -127,9 +99,12 @@ private:
     void SetIcons(const wxIcon& copy,
                   const wxIcon& move,
                   const wxIcon& none);
-};
 
-#endif // wxUSE_DRAG_AND_DROP
+    // GTK implementation
+    void GTKConnectDragSignals();
+    void GTKDisconnectDragSignals();
+
+};
 
-#endif //__GTKDNDH__
+#endif // _WX_GTK_DND_H_