Small Motif bug fixes

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

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index 1ca1e33671b11b8814b32499dd6bc2218f89ce6a..937fe1aa896ddba3a793568d0b45aefeaaa1493f 100644 (file)
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -2,7 +2,7 @@
 // Name:        dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // Name:        dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////


@@ -20,6 +20,16 @@
 #include "wx/string.h"
 #include "wx/cursor.h"
 
 #include "wx/string.h"
 #include "wx/cursor.h"
 

+//-------------------------------------------------------------------------
+// conditional compilation
+//-------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MICRO_VERSION >= 3)
+#define NEW_GTK_DND_CODE
+#endif
+#endif
+

 //-------------------------------------------------------------------------
 // classes
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // classes
 //-------------------------------------------------------------------------


@@ -43,46 +53,14 @@ class wxDropSource;
 class wxDataObject: public wxObject
 {
 public:
 class wxDataObject: public wxObject
 {
 public:

-  // all data formats (values are the same as in windows.h, do not change!)
-  enum StdFormat
-  {
-    Invalid,
-    Text,
-    Bitmap,
-    MetafilePict,
-    Sylk,
-    Dif,
-    Tiff,
-    OemText,
-    Dib,
-    Palette,
-    Pendata,
-    Riff,
-    Wave,
-    UnicodeText,
-    EnhMetafile,
-    Hdrop,
-    Locale,
-    Max
-  };
-
-  // function to return symbolic name of clipboard format (debug messages)
-  static const char *GetFormatName(wxDataFormat format);
-
-  // ctor & dtor
+

   wxDataObject() {};
   ~wxDataObject() {};
 
   wxDataObject() {};
   ~wxDataObject() {};
 

-  // pure virtuals to override
-    // get the best suited format for our data

   virtual wxDataFormat GetPreferredFormat() const = 0;
   virtual wxDataFormat GetPreferredFormat() const = 0;

-    // decide if we support this format (should be one of values of
-    // StdFormat enumerations or a user-defined format)
-  virtual bool IsSupportedFormat(wxDataFormat format) const = 0;
-    // get the (total) size of data
-  virtual uint GetDataSize() const = 0;
-    // copy raw data to provided pointer
-  virtual void GetDataHere(void *pBuf) const = 0;
+  virtual bool IsSupportedFormat( wxDataFormat format ) const = 0;
+  virtual size_t GetDataSize() const = 0;
+  virtual void GetDataHere( void *data ) const = 0;

 
 };
 
 
 };
 


@@ -93,20 +71,22 @@ public:
 class wxTextDataObject : public wxDataObject
 {
 public:
 class wxTextDataObject : public wxDataObject
 {
 public:

-  // ctors
+

   wxTextDataObject() { }
   wxTextDataObject(const wxString& strText) : m_strText(strText) { }
   void Init(const wxString& strText) { m_strText = strText; }
 
   wxTextDataObject() { }
   wxTextDataObject(const wxString& strText) : m_strText(strText) { }
   void Init(const wxString& strText) { m_strText = strText; }
 

-  // implement base class pure virtuals

   virtual wxDataFormat GetPreferredFormat() const
     { return wxDF_TEXT; }
   virtual wxDataFormat GetPreferredFormat() const
     { return wxDF_TEXT; }

+    

   virtual bool IsSupportedFormat(wxDataFormat format) const
     { return format == wxDF_TEXT; }
   virtual bool IsSupportedFormat(wxDataFormat format) const
     { return format == wxDF_TEXT; }

-  virtual uint GetDataSize() const
-    { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
-  virtual void GetDataHere(void *pBuf) const
-    { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
+
+  virtual size_t GetDataSize() const
+    { return m_strText.Len() + 1; } // +1 for trailing '\0'
+    
+  virtual void GetDataHere( void *data ) const
+    { memcpy(data, m_strText.c_str(), GetDataSize()); }

 
 private:
   wxString  m_strText;
 
 private:
   wxString  m_strText;


@@ -123,17 +103,19 @@ public:
 
   wxFileDataObject(void) { }
   void AddFile( const wxString &file )
 
   wxFileDataObject(void) { }
   void AddFile( const wxString &file )

-    { m_files += file; m_files += ";"; }
+    { m_files += file; m_files += '\0'; }

 
 

-  // implement base class pure virtuals

   virtual wxDataFormat GetPreferredFormat() const
     { return wxDF_FILENAME; }
   virtual wxDataFormat GetPreferredFormat() const
     { return wxDF_FILENAME; }

-  virtual bool IsSupportedFormat(wxDataFormat format) const
+    
+  virtual bool IsSupportedFormat( wxDataFormat format ) const

     { return format == wxDF_FILENAME; }
     { return format == wxDF_FILENAME; }

-  virtual uint GetDataSize() const
-    { return m_files.Len() + 1; } // +1 for trailing '\0'of course
-  virtual void GetDataHere(void *pBuf) const
-    { memcpy(pBuf, m_files.c_str(), GetDataSize()); }
+    
+  virtual size_t GetDataSize() const
+    { return m_files.Len(); } // no trailing '\0'
+    
+  virtual void GetDataHere( void *data ) const
+    { memcpy(data, m_files.c_str(), GetDataSize()); }

 
 private:
   wxString  m_files;
 
 private:
   wxString  m_files;


@@ -152,18 +134,15 @@ class wxDropTarget: public wxObject
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }

-    virtual bool OnDrop( long x, long y, const void *pData ) = 0;
+    virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;

 
 

-//  protected:
-      
-    friend wxWindow;
-    

     // Override these to indicate what kind of data you support: 
   
     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 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;
   

-    void Drop( GdkEvent *event, int x, int y );
+  // implementation
+  

     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
 };
     void RegisterWidget( GtkWidget *widget );
     void UnregisterWidget( GtkWidget *widget );
 };


@@ -177,7 +156,7 @@ class wxTextDropTarget: public wxDropTarget
   public:
 
     wxTextDropTarget() {};
   public:
 
     wxTextDropTarget() {};

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

     virtual bool OnDropText( long x, long y, const char *psz );
     
   protected:
     virtual bool OnDropText( long x, long y, const char *psz );
     
   protected:


@@ -196,9 +175,9 @@ class wxFileDropTarget: public wxDropTarget
     
     wxFileDropTarget() {};
     
     
     wxFileDropTarget() {};
     

-    virtual bool OnDrop(long x, long y, const void *pData);
+    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:
   


@@ -210,39 +189,37 @@ class wxFileDropTarget: public wxDropTarget
 // wxDropSource
 //-------------------------------------------------------------------------
 
 // wxDropSource
 //-------------------------------------------------------------------------
 

+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)
+};
+

 class wxDropSource: public wxObject
 {
   public:
 
 class wxDropSource: public wxObject
 {
   public:
 

-  enum DragResult
-  {
-    Error,    // error prevented the d&d operation from completing
-    None,     // drag target didn't accept the data
-    Copy,     // the data was successfully copied
-    Move,     // the data was successfully moved
-    Cancel    // the operation was cancelled by user (not an error)
-  };
-

     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     ~wxDropSource(void);
     
     void SetData( wxDataObject &data  );

-    DragResult DoDragDrop( bool bAllowMove = FALSE );
+    wxDragResult DoDragDrop( bool bAllowMove = FALSE );

     
     

-    virtual bool GiveFeedback( DragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
-
-  protected:
-  
-    friend void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source );
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };

   
   

+  // implementation
+      

     void RegisterWindow(void);
     void UnregisterWindow(void);
   
     GtkWidget     *m_widget;
     wxWindow      *m_window;
     void RegisterWindow(void);
     void UnregisterWindow(void);
   
     GtkWidget     *m_widget;
     wxWindow      *m_window;

-    DragResult     m_retValue;
+    wxDragResult   m_retValue;

     wxDataObject  *m_data;
     
     wxCursor      m_defaultCursor;
     wxDataObject  *m_data;
     
     wxCursor      m_defaultCursor;