X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..73bab6b44da953b35b902c9f3199582e4e76d89b:/include/wx/motif/dnd.h

diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h
index 2cb1947fa5..86701b9f7b 100644
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -11,7 +11,7 @@
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -43,21 +43,21 @@ class WXDLLEXPORT wxDropSource;
 
 class WXDLLEXPORT wxDropTarget: public wxObject
 {
-  public:
-
+public:
+    
     wxDropTarget();
     ~wxDropTarget();
     
     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: 
-  
+    
     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 0;
-  
-  // implementation
+    
+    // implementation
 };
 
 //-------------------------------------------------------------------------
@@ -66,14 +66,14 @@ class WXDLLEXPORT wxDropTarget: public wxObject
 
 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 );
     
-  protected:
-  
+protected:
+    
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
@@ -85,27 +85,27 @@ class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
 class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget
 {
 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(".
+    wxPrivateDropTarget();
     
-  void SetId( const wxString& id )
-      { m_id = id; }
+    // 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; }
     
-  wxString GetId()
-      { return m_id; }
-
 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 +114,16 @@ private:
 
 class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 {
-  public:
+public:
     
     wxFileDropTarget() {};
     
     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[] );
-
-  protected:
-  
+        size_t nFiles, const char * const aszFiles[] );
+    
+protected:
+    
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
@@ -134,32 +134,32 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 
 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
 {
-  public:
-
+public:
+    
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );
-    wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+    wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     
     virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
-  
-  // implementation
+    
+    // implementation
 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);
-  
+    
     wxWindow      *m_window;
     wxDragResult   m_retValue;
     wxDataObject  *m_data;
@@ -171,8 +171,8 @@ class WXDLLEXPORT wxDropSource: public wxObject
 
 #endif
 
-   // wxUSE_DRAG_AND_DROP
+// wxUSE_DRAG_AND_DROP
 
 #endif  
-       //_WX_DND_H_
+//_WX_DND_H_