applying editor part of patch, see #15003

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

diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index 1af3bacce2857d281e1abd3a55636c27d9926749..02cae89adb80e3f76b1d5b3c263160ceb2ecf1ca 100644 (file)
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.h
+// Name:        wx/x11/dnd.h

 // Purpose:     declaration of wxDropTarget, wxDropSource classes
 // Author:      Julian Smart
 // RCS-ID:      $Id$
 // Purpose:     declaration of wxDropTarget, wxDropSource classes
 // Author:      Julian Smart
 // RCS-ID:      $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/defs.h"
 
 #if wxUSE_DRAG_AND_DROP


@@ -28,35 +23,35 @@
 // classes
 //-------------------------------------------------------------------------
 
 // classes
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

-class WXDLLEXPORT wxDropTarget;
-class WXDLLEXPORT wxTextDropTarget;
-class WXDLLEXPORT wxFileDropTarget;
-class WXDLLEXPORT wxPrivateDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxPrivateDropTarget;

 
 

-class WXDLLEXPORT wxDropSource;
+class WXDLLIMPEXP_FWD_CORE wxDropSource;

 
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxDropTarget
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDropTarget: public wxObject
+class WXDLLIMPEXP_CORE wxDropTarget: public wxObject

 {
 public:
 {
 public:

-    
+

     wxDropTarget();
     wxDropTarget();

-    ~wxDropTarget();
-    
+    virtual ~wxDropTarget();
+

     virtual void OnEnter() { }
     virtual void OnLeave() { }
     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;

-    
-    // Override these to indicate what kind of data you support: 
-    
+
+    // Override these to indicate what kind of data you support:
+

     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 0;
     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 0;

-    
+

     // implementation
 };
 
     // implementation
 };
 


@@ -64,16 +59,16 @@ public:
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
+class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget

 {
 public:
 {
 public:

-    
-    wxTextDropTarget() {};
+
+    wxTextDropTarget() {}

     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );

-    
+

 protected:
 protected:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };


@@ -82,29 +77,29 @@ protected:
 // wxPrivateDropTarget
 //-------------------------------------------------------------------------
 
 // wxPrivateDropTarget
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget
+class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget

 {
 public:
 {
 public:

-    
+

     wxPrivateDropTarget();
     wxPrivateDropTarget();

-    
+

     // you have to override OnDrop to get at the data
     // you have to override OnDrop to get at the data

-    
+

     // the string ID identifies the format of clipboard or DnD data. a word
     // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
     // to the clipboard - the latter with the Id "WXWORD_FORMAT".
     // the string ID identifies the format of clipboard or DnD data. a word
     // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
     // to the clipboard - the latter with the Id "WXWORD_FORMAT".

-    
+

     void SetId( const wxString& id )
     { m_id = id; }
     void SetId( const wxString& id )
     { m_id = id; }

-    
+

     wxString GetId()
     { return m_id; }
     wxString GetId()
     { return m_id; }

-    
+

 private:
 private:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;

-    
+

     wxString   m_id;
 };
 
     wxString   m_id;
 };
 


@@ -112,18 +107,18 @@ private:
 // A drop target which accepts files (dragged from File Manager or Explorer)
 // ----------------------------------------------------------------------------
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
+class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget

 {
 public:
 {
 public:

-    
-    wxFileDropTarget() {};
-    
+
+    wxFileDropTarget() {}
+

     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDrop( long x, long y, const void *data, size_t size );

-    virtual bool OnDropFiles( long x, long y, 
+    virtual bool OnDropFiles( long x, long y,

         size_t nFiles, const char * const aszFiles[] );
         size_t nFiles, const char * const aszFiles[] );

-    
+

 protected:
 protected:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };


@@ -141,29 +136,29 @@ enum wxDragResult
         wxDragCancel    // the operation was cancelled by user (not an error)
 };
 
         wxDragCancel    // the operation was cancelled by user (not an error)
 };
 

-class WXDLLEXPORT wxDropSource: public wxObject
+class WXDLLIMPEXP_CORE wxDropSource: public wxObject

 {
 public:
 {
 public:

-    
+

     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );

-    
-    ~wxDropSource(void);
-    
+
+    virtual ~wxDropSource(void);
+

     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);

-    
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
-    
+
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
+

     // implementation
 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);
     // implementation
 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);

-    
+

     wxWindow      *m_window;
     wxDragResult   m_retValue;
     wxDataObject  *m_data;
     wxWindow      *m_window;
     wxDragResult   m_retValue;
     wxDataObject  *m_data;

-    
+

     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
 #endif
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
 #endif


@@ -173,6 +168,6 @@ public:
 
 // wxUSE_DRAG_AND_DROP
 
 
 // wxUSE_DRAG_AND_DROP
 

-#endif  
+#endif

 //_WX_DND_H_
 
 //_WX_DND_H_