carbon cfm fixes

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

diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index e742cd9f41231dd3a135c1248f280f7a10cd93bd..fa14819b1793c1b9c7cd952d066f44266c71c807 100644 (file)
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -1,178 +1,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.h
-// Purpose:     declaration of the wxDataObject class
+// Name:        gtk/dataobj.h
+// Purpose:     declaration of the wxDataObject

 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Author:      Robert Roebling
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows license
+// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDATAOBJECTH__
-#define __GTKDATAOBJECTH__
+#ifndef _WX_GTK_DATAOBJ_H_
+#define _WX_GTK_DATAOBJ_H_

 
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "dataobj.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/bitmap.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class wxDataObject;
-class wxTextDataObject;
-class wxBitmapDataObject;
-class wxPrivateDataObject;
-class wxFileDataObject;
-
-//-------------------------------------------------------------------------
-// wxDataObject
-//-------------------------------------------------------------------------
-
-class wxDataObject: public wxObject
-{
-  DECLARE_ABSTRACT_CLASS( wxDataObject )
-
-public:
-
-  wxDataObject() {}
-  ~wxDataObject() {}
-
-  virtual wxDataFormat GetFormat() const = 0;
-  
-  // implementation
-  
-  GdkAtom  m_formatAtom;
-};
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxTextDataObject is a specialization of wxDataObject for text data
+// wxDataObject is the same as wxDataObjectBase under wxGTK

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxTextDataObject : public wxDataObject
+class wxDataObject : public wxDataObjectBase

 {
 {

-  DECLARE_DYNAMIC_CLASS( wxTextDataObject )
-

 public:
 public:

+    wxDataObject();
+    virtual ~wxDataObject();

 
 

-  wxTextDataObject() {}
-  wxTextDataObject( const wxString& strText ) 
-    : m_strText(strText) { }
-  
-  virtual wxDataFormat GetFormat() const
-    { return wxDF_TEXT; }
-    
-  void SetText( const wxString& strText) 
-    { m_strText = strText; }
-    
-  wxString GetText() const
-    { return m_strText; }
-
-private:
-  wxString  m_strText;
-
+    virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;

 };
 
 };
 

-// ----------------------------------------------------------------------------
-// wxFileDataObject is a specialization of wxDataObject for file names
-// ----------------------------------------------------------------------------
-
-class wxFileDataObject : public wxDataObject
-{
-  DECLARE_DYNAMIC_CLASS( wxFileDataObject )
-
-public:
-
-  wxFileDataObject(void) {}
-  
-  virtual wxDataFormat GetFormat() const
-    { return wxDF_FILENAME; }
-    
-  void AddFile( const wxString &file )
-    { m_files += file; m_files += (char)0; }
-    
-  wxString GetFiles() const
-    { return m_files; }
-    
-private:
-  wxString  m_files;
-  
-};
-
-// ----------------------------------------------------------------------------
-// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
-// ----------------------------------------------------------------------------
-
-class wxBitmapDataObject : public wxDataObject
-{
-  DECLARE_DYNAMIC_CLASS( wxBitmapDataObject )
-
-public:
-
-  wxBitmapDataObject(void) {}
-  
-  virtual wxDataFormat GetFormat() const
-    { return wxDF_BITMAP; }
-    
-  void SetBitmap( const wxBitmap &bitmap )
-    { m_bitmap = bitmap; }
-    
-  wxBitmap GetBitmap() const
-    { return m_bitmap; }
-    
-private:
-  wxBitmap  m_bitmap;
-};
-
-// ----------------------------------------------------------------------------
-// wxPrivateDataObject is a specialization of wxDataObject for app specific data
-// ----------------------------------------------------------------------------
-
-class wxPrivateDataObject : public wxDataObject
-{
-  DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
-
-public:
-
-  wxPrivateDataObject() 
-    { m_size = 0; m_data = (char*) NULL; }
-    
-  ~wxPrivateDataObject()
-    { if (m_data) delete[] m_data; }
-  
-  virtual wxDataFormat GetFormat() const
-    { return wxDF_PRIVATE; }
-    
-  // 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() const
-    { return m_id; }
-
-  // will make internal copy
-  void SetData( const char *data, size_t size );
-    
-  size_t GetDataSize() const
-    { return m_size; }
-    
-  char* GetData() const
-    { return m_data; }
-    
-private:
-  size_t     m_size;
-  char*      m_data;
-  wxString   m_id;
-};
-
-
-#endif  
-       //__GTKDNDH__
+#endif // _WX_GTK_DATAOBJ_H_