X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/gtk1/dnd.h diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h index 86ec39b1d2..8102626aa2 100644 --- a/include/wx/gtk1/dnd.h +++ b/include/wx/gtk1/dnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.h +// Name: wx/gtk1/dnd.h // Purpose: declaration of the wxDropTarget class // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,14 +7,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// - #ifndef __GTKDNDH__ #define __GTKDNDH__ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - #if wxUSE_DRAG_AND_DROP #include "wx/object.h" @@ -28,13 +23,13 @@ // classes //------------------------------------------------------------------------- -class wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindow; -class wxDropTarget; -class wxTextDropTarget; -class wxFileDropTarget; +class WXDLLIMPEXP_FWD_CORE wxDropTarget; +class WXDLLIMPEXP_FWD_CORE wxTextDropTarget; +class WXDLLIMPEXP_FWD_CORE wxFileDropTarget; -class wxDropSource; +class WXDLLIMPEXP_FWD_CORE wxDropSource; // ---------------------------------------------------------------------------- // macros @@ -50,10 +45,10 @@ class wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class wxDropTarget: public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase { 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); @@ -62,7 +57,7 @@ public: // implementation - GdkAtom GetMatchingPair(); + GdkAtom GetMatchingPair(bool quiet = false); void RegisterWidget( GtkWidget *widget ); void UnregisterWidget( GtkWidget *widget ); @@ -70,24 +65,24 @@ public: GdkDragContext *m_dragContext; GtkWidget *m_dragWidget; GtkSelectionData *m_dragData; - guint m_dragTime; + unsigned 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 SetDragTime(unsigned time) { m_dragTime = time; } }; //------------------------------------------------------------------------- // wxDropSource //------------------------------------------------------------------------- -class wxDropSource: public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: // constructor. set data later with SetData() - wxDropSource( wxWindow *win = (wxWindow *)NULL, + wxDropSource( wxWindow *win = NULL, const wxIcon © = wxNullIcon, const wxIcon &move = wxNullIcon, const wxIcon &none = wxNullIcon);