*** empty log message ***

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

diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h
index b360614805de9fca4fe4c4a5ae500e56bdd99733..e8d598e3ddc2b4487e59910650d670e147546687 100644 (file)
--- a/include/wx/gtk1/dataobj.h
+++ b/include/wx/gtk1/dataobj.h
@@ -31,63 +31,48 @@ class wxBitmapDataObject;
 class wxPrivateDataObject;
 class wxFileDataObject;
 
 class wxPrivateDataObject;
 class wxFileDataObject;
 

-//-------------------------------------------------------------------------
-// wxDataType (internal)
-//-------------------------------------------------------------------------
-
-enum wxDataType
-{
-  wxDF_INVALID =          0,
-  wxDF_TEXT =             1,  /* CF_TEXT */
-  wxDF_BITMAP =           2,  /* CF_BITMAP */
-  wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
-  wxDF_SYLK =             4,
-  wxDF_DIF =              5,
-  wxDF_TIFF =             6,
-  wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */
-  wxDF_DIB =              8,  /* CF_DIB */
-  wxDF_PALETTE =          9,
-  wxDF_PENDATA =          10,
-  wxDF_RIFF =             11,
-  wxDF_WAVE =             12,
-  wxDF_UNICODETEXT =      13,
-  wxDF_ENHMETAFILE =      14,
-  wxDF_FILENAME =         15, /* CF_HDROP */
-  wxDF_LOCALE =           16,
-  wxDF_PRIVATE =          20
-};
-

 //-------------------------------------------------------------------------
 // wxDataFormat (internal)
 //-------------------------------------------------------------------------
 
 class wxDataFormat : public wxObject
 {
 //-------------------------------------------------------------------------
 // wxDataFormat (internal)
 //-------------------------------------------------------------------------
 
 class wxDataFormat : public wxObject
 {

-  DECLARE_CLASS( wxDataFormat )
-  
+    DECLARE_CLASS( wxDataFormat )
+

 public:
 public:

-  
-  wxDataFormat();
-  wxDataFormat( wxDataType type );
-  wxDataFormat( const wxString &id );
-  wxDataFormat( const char *id );
-  wxDataFormat( wxDataFormat &format );
-  wxDataFormat( const GdkAtom atom );
-
-  void SetType( wxDataType type );    
-  wxDataType GetType() const;
-  
-  wxString GetId() const;
-  void SetId( const char *id );
-  
-  GdkAtom GetAtom();
-      
-private:
+    wxDataFormat();
+    wxDataFormat( wxDataFormatId type );
+    wxDataFormat( const wxString &id );
+    wxDataFormat( const wxChar *id );
+    wxDataFormat( const wxDataFormat &format );
+    wxDataFormat( const GdkAtom atom );

 
 

-  wxDataType  m_type;
-  wxString    m_id;
-  bool        m_hasAtom;
-  GdkAtom     m_atom;
+    void SetType( wxDataFormatId type );
+    wxDataFormatId GetType() const;
+
+    /* 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 "application/wxword", an
+     * image manipulation program would put a wxBitmapDataObject and a
+     * wxPrivateDataObject to the clipboard - the latter with "image/png". */
+
+    wxString GetId() const;
+    void SetId( const wxChar *id );
+
+    GdkAtom GetAtom();
+    void SetAtom(GdkAtom atom) { m_hasAtom = TRUE; m_atom = atom; }
+
+    // implicit conversion to wxDataFormatId
+    operator wxDataFormatId() const { return m_type; }
+
+    bool operator==(wxDataFormatId type) const { return m_type == type; }
+    bool operator!=(wxDataFormatId type) const { return m_type != type; }
+
+private:
+    wxDataFormatId  m_type;
+    wxString    m_id;
+    bool        m_hasAtom;
+    GdkAtom     m_atom;

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


@@ -102,36 +87,36 @@ public:
 
   /* constructor */
   wxDataBroker();
 
   /* constructor */
   wxDataBroker();

-  
+

   /* add data object */
   void Add( wxDataObject *dataObject, bool preferred = FALSE );
   /* add data object */
   void Add( wxDataObject *dataObject, bool preferred = FALSE );

-  
-private:  
-  
+
+private:
+

   /* OLE implementation, the methods don't need to be overridden */
   /* OLE implementation, the methods don't need to be overridden */

-  
+

   /* get number of supported formats */
   virtual size_t GetFormatCount() const;
   /* get number of supported formats */
   virtual size_t GetFormatCount() const;

-  
-  /* return nth supported format */    
+
+  /* return nth supported format */

   virtual wxDataFormat &GetNthFormat( size_t nth ) const;
   virtual wxDataFormat &GetNthFormat( size_t nth ) const;

-    
-  /* return preferrd/best supported format */    
-  virtual wxDataFormat &GetPreferredFormat() const;
-    
+
+  /* return preferrd/best supported format */
+  virtual wxDataFormatId GetPreferredFormat() const;
+

   /* search through m_dataObjects, return TRUE if found */
   virtual bool IsSupportedFormat( wxDataFormat &format ) const;
   /* search through m_dataObjects, return TRUE if found */
   virtual bool IsSupportedFormat( wxDataFormat &format ) const;

-  
+

   /* search through m_dataObjects and call child's GetSize() */
   virtual size_t GetSize( wxDataFormat& format ) const;
   /* search through m_dataObjects and call child's GetSize() */
   virtual size_t GetSize( wxDataFormat& format ) const;

-    
+

   /* search through m_dataObjects and call child's WriteData(dest) */
   virtual void WriteData( wxDataFormat& format, void *dest ) const;
   /* search through m_dataObjects and call child's WriteData(dest) */
   virtual void WriteData( wxDataFormat& format, void *dest ) const;

-  
+

   /* implementation */
 
 public:
   /* implementation */
 
 public:

-  
+

   wxList    m_dataObjects;
   size_t    m_preferred;
 };
   wxList    m_dataObjects;
   size_t    m_preferred;
 };


@@ -143,29 +128,29 @@ public:
 class wxDataObject : public wxObject
 {
   DECLARE_DYNAMIC_CLASS( wxDataObject )
 class wxDataObject : public wxObject
 {
   DECLARE_DYNAMIC_CLASS( wxDataObject )

-  
+

 public:
 
   /* constructor */
   wxDataObject();
 public:
 
   /* constructor */
   wxDataObject();

-  
+

   /* destructor */
   ~wxDataObject();
   /* destructor */
   ~wxDataObject();

-  
-  /* write data to dest */  
+
+  /* write data to dest */

   virtual void WriteData( void *dest ) const = 0;
   virtual void WriteData( void *dest ) const = 0;

- 
-  /* get size of data */ 
+
+  /* get size of data */

   virtual size_t GetSize() const = 0;
   virtual size_t GetSize() const = 0;

-  
+

   /* implementation */
   /* implementation */

-  
+

   wxDataFormat &GetFormat();
   wxDataFormat &GetFormat();

-  
-  wxDataType GetFormatType() const;
+
+  wxDataFormatId GetFormatType() const;

   wxString   GetFormatId() const;
   GdkAtom    GetFormatAtom() const;
   wxString   GetFormatId() const;
   GdkAtom    GetFormatAtom() const;

-  
+

   wxDataFormat m_format;
 };
 
   wxDataFormat m_format;
 };
 


@@ -182,27 +167,27 @@ public:
   /* default constructor. call SetText() later or override
      WriteData() and GetSize() for working on-demand */
   wxTextDataObject();
   /* default constructor. call SetText() later or override
      WriteData() and GetSize() for working on-demand */
   wxTextDataObject();

-  
+

   /* constructor */
   wxTextDataObject( const wxString& data );
   /* constructor */
   wxTextDataObject( const wxString& data );

-  
+

   /* set current text data */
   void SetText( const wxString& data );
   /* set current text data */
   void SetText( const wxString& data );

-    
+

   /* get current text data */
   wxString GetText() const;
 
   /* by default calls WriteString() with string set by constructor or
      by SetText(). can be overridden for working on-demand */
   virtual void WriteData( void *dest ) const;
   /* get current text data */
   wxString GetText() const;
 
   /* by default calls WriteString() with string set by constructor or
      by SetText(). can be overridden for working on-demand */
   virtual void WriteData( void *dest ) const;

-  
-  /* by default, returns length of string as set by constructor or 
+
+  /* by default, returns length of string as set by constructor or

      by SetText(). can be overridden for working on-demand */
   virtual size_t GetSize() const;
      by SetText(). can be overridden for working on-demand */
   virtual size_t GetSize() const;

-  
+

   /* write string to dest */
   void WriteString( const wxString &str, void *dest ) const;
   /* write string to dest */
   void WriteString( const wxString &str, void *dest ) const;

-  
+

   /* implementation */
 
   wxString  m_data;
   /* implementation */
 
   wxString  m_data;


@@ -220,20 +205,20 @@ public:
 
   /* default constructor */
   wxFileDataObject();
 
   /* default constructor */
   wxFileDataObject();

-    
+

   /* add file name to list */
   void AddFile( const wxString &file );
   /* add file name to list */
   void AddFile( const wxString &file );

-    
+

   /* get all filename as one string. each file name is 0 terminated,
      the list is double zero terminated */
   wxString GetFiles() const;
   /* get all filename as one string. each file name is 0 terminated,
      the list is double zero terminated */
   wxString GetFiles() const;

-    
+

   /* write list of filenames */
   virtual void WriteData( void *dest ) const;
 
   /* write list of filenames */
   virtual void WriteData( void *dest ) const;
 

-  /* return length of list of filenames */  
+  /* return length of list of filenames */

   virtual size_t GetSize() const;
   virtual size_t GetSize() const;

-  
+

   /* implementation */
 
   wxString  m_files;
   /* implementation */
 
   wxString  m_files;


@@ -253,66 +238,21 @@ public:
 
   wxBitmapDataObject();
   wxBitmapDataObject( const wxBitmap& bitmap );
 
   wxBitmapDataObject();
   wxBitmapDataObject( const wxBitmap& bitmap );

-  
+

   void SetBitmap( const wxBitmap &bitmap );
   wxBitmap GetBitmap() const;
   void SetBitmap( const wxBitmap &bitmap );
   wxBitmap GetBitmap() const;

-  
+

   virtual void WriteData( void *dest ) const;
   virtual size_t GetSize() const;
   virtual void WriteData( void *dest ) const;
   virtual size_t GetSize() const;

-  
+

   void WriteBitmap( const wxBitmap &bitmap, void *dest ) const;
   void WriteBitmap( const wxBitmap &bitmap, void *dest ) const;

-    
+

   // implementation
 
   wxBitmap  m_bitmap;
   // implementation
 
   wxBitmap  m_bitmap;

-  
-};
-
-//----------------------------------------------------------------------------
-// wxPrivateDataObject is a specialization of wxDataObject for app specific data
-//----------------------------------------------------------------------------
-
-class wxPrivateDataObject : public wxDataObject
-{
-  DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )

 
 

-public:
-
-  /* see wxTextDataObject for explanation of functions */
-  
-  wxPrivateDataObject();
-  ~wxPrivateDataObject();
-  
-  /* 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 "application/wxword", an
-   * image manipulation program would put a wxBitmapDataObject and a
-   * wxPrivateDataObject to the clipboard - the latter with "image/png". */
-    
-  void SetId( const wxString& id );
-    
-  /* get id */
-  wxString GetId() const;
-
-  /* set data. will make internal copy. */
-  void SetData( const char *data, size_t size );
-    
-  /* returns pointer to data */
-  char* GetData() const;
-  
-  virtual void WriteData( void *dest ) const;
-  virtual size_t GetSize() const;
-  
-  void WriteData( const char *data, void *dest ) const;
-    
-  // implementation
-
-  size_t     m_size;
-  char*      m_data;
-  wxString   m_id;

 };
 
 };
 

-
-#endif  
+#endif

        //__GTKDNDH__
 
        //__GTKDNDH__