Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index c2210c23a34f55f3408f3aaca4b1a8fd3970d16d..30e356ee61898f3a7fc84161f0601bcb27709dfb 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -7,34 +7,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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/icon.h"

-#include "wx/gdicmn.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class wxWindow;
-
-class wxDropTarget;
-class wxTextDropTarget;
-class wxFileDropTarget;
-
-class wxDropSource;

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -50,22 +26,26 @@ class wxDropSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
 // wxDropTarget
 //-------------------------------------------------------------------------
 

-class wxDropTarget: public wxDropTargetBase
+class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase

 {
 public:
 {
 public:

-    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
+    wxDropTarget(wxDataObject *dataObject = NULL );

 
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 
 
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 

-  // implementation
+    // Can only be called during OnXXX methods.
+    wxDataFormat GetMatchingPair();
+
+    // implementation

 
 

-    GdkAtom GetMatchingPair();
+    GdkAtom GTKGetMatchingPair(bool quiet = false);
+    wxDragResult GTKFigureOutSuggestedAction();

 
 

-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
+    void GtkRegisterWidget( GtkWidget *widget );
+    void GtkUnregisterWidget( GtkWidget *widget );

 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;


@@ -73,21 +53,21 @@ public:
     guint               m_dragTime;
     bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 
     guint               m_dragTime;
     bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 

-    void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
-    void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
-    void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
-    void SetDragTime( guint time ) { m_dragTime = time; }
+    void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
+    void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
+    void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
+    void GTKSetDragTime( guint time ) { m_dragTime = time; }

 };
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 
 };
 
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
 

-class wxDropSource: public wxDropSourceBase
+class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase

 {
 public:
     // constructor. set data later with SetData()
 {
 public:
     // constructor. set data later with SetData()

-    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+    wxDropSource( wxWindow *win = NULL,

                   const wxIcon &copy = wxNullIcon,
                   const wxIcon &move = wxNullIcon,
                   const wxIcon &none = wxNullIcon);
                   const wxIcon &copy = wxNullIcon,
                   const wxIcon &move = wxNullIcon,
                   const wxIcon &none = wxNullIcon);


@@ -104,10 +84,6 @@ public:
     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
     // 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;
     void PrepareIcon( int action, GdkDragContext *context );
 
     GtkWidget       *m_widget;


@@ -127,9 +103,12 @@ private:
     void SetIcons(const wxIcon& copy,
                   const wxIcon& move,
                   const wxIcon& none);
     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_