STL compilation fix

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

diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h
index 2cb1947fa57910bb38b3db810fa845a905c54efd..614096f54811f10a8ca0d94b344ffbf9552b9f76 100644 (file)
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.h
+// Name:        wx/motif/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_
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

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


@@ -43,21 +38,21 @@ class WXDLLEXPORT wxDropSource;
 
 class WXDLLEXPORT wxDropTarget: public wxObject
 {
 
 class WXDLLEXPORT 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

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


@@ -66,14 +61,14 @@ class WXDLLEXPORT wxDropTarget: public wxObject
 
 class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
 {
 
 class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
 {

-  public:
+public:

 
     wxTextDropTarget() {};
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
 
     wxTextDropTarget() {};
     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;
 };


@@ -86,26 +81,26 @@ class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget
 {
 public:
 
 {
 public:
 

-  wxPrivateDropTarget();
-  
-  // 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(".
-    
-  void SetId( const wxString& id )
-      { m_id = id; }
-    
-  wxString GetId()
-      { return m_id; }
+    wxPrivateDropTarget();
+
+    // 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".
+
+    void SetId( const wxString& id )
+    { m_id = id; }
+
+    wxString GetId()
+    { return m_id; }

 
 private:
 
 
 private:
 

-  virtual size_t GetFormatCount() const;
-  virtual wxDataFormat GetFormat(size_t n) const;
-    
-  wxString   m_id;
+    virtual size_t GetFormatCount() const;
+    virtual wxDataFormat GetFormat(size_t n) const;
+
+    wxString   m_id;

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


@@ -114,16 +109,16 @@ private:
 
 class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 {
 
 class WXDLLEXPORT 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, 
-                              size_t nFiles, const char * const aszFiles[] );
+    virtual bool OnDropFiles( long x, long y,
+        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;
 };


@@ -134,36 +129,36 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 
 enum wxDragResult
 {
 
 enum wxDragResult
 {

-  wxDragError,    // error prevented the d&d operation from completing
-  wxDragNone,     // drag target didn't accept the data
-  wxDragCopy,     // the data was successfully copied
-  wxDragMove,     // the data was successfully moved
-  wxDragCancel    // the operation was cancelled by user (not an error)
+    wxDragError,    // error prevented the d&d operation from completing
+        wxDragNone,     // drag target didn't accept the data
+        wxDragCopy,     // the data was successfully copied
+        wxDragMove,     // the data was successfully moved
+        wxDragCancel    // the operation was cancelled by user (not an error)

 };
 
 class WXDLLEXPORT wxDropSource: public wxObject
 {
 };
 
 class WXDLLEXPORT 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  );
     void SetData( wxDataObject &data  );

-    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
-    
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
-  
-  // implementation
+    wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
+
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; };
+
+    // implementation

 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);
 #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


@@ -171,8 +166,7 @@ class WXDLLEXPORT wxDropSource: public wxObject
 
 #endif
 
 
 #endif
 

-   // wxUSE_DRAG_AND_DROP
-
-#endif  
-       //_WX_DND_H_
+// wxUSE_DRAG_AND_DROP

 
 

+#endif
+//_WX_DND_H_