include wx/object.h now that wxConfigBase derives from wxObject

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

diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 9da24dd2577100c6bf83eeb9266a2006e1322035..3b66e3117a399ce538a0408a7e12023e1a7af83d 100644 (file)
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GTK_DATAFORM_H
 #define _WX_GTK_DATAFORM_H
 
 #ifndef _WX_GTK_DATAFORM_H
 #define _WX_GTK_DATAFORM_H
 

-class wxDataFormat
+class WXDLLIMPEXP_CORE wxDataFormat

 {
 public:
     // the clipboard formats under GDK are GdkAtoms
 {
 public:
     // the clipboard formats under GDK are GdkAtoms


@@ -24,6 +24,8 @@ public:
     wxDataFormat( const wxChar *id );
     wxDataFormat( NativeFormat format );
 
     wxDataFormat( const wxChar *id );
     wxDataFormat( NativeFormat format );
 

+    wxDataFormat& operator=(const wxDataFormat& format)
+        { m_type = format.m_type; m_format = format.m_format; return *this; }

     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
 
     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
 


@@ -52,13 +54,13 @@ public:
 
     // implementation
     wxDataFormatId GetType() const;
 
     // implementation
     wxDataFormatId GetType() const;

+    void SetType( wxDataFormatId type );

 
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();
 
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();

-    void SetType( wxDataFormatId type );

 };
 
 #endif // _WX_GTK_DATAFORM_H
 };
 
 #endif // _WX_GTK_DATAFORM_H