Made wxClientDC's use safe as per wxMSW.

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

diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index 13c80135ca038c1a2fba27b6d6fdef3d5ff26523..cda2856ce0f9fdde2da7738d6b4cc0e55dc13669 100644 (file)
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -32,7 +32,7 @@ class wxPrivateDataObject;
 class wxFileDataObject;
 
 //-------------------------------------------------------------------------
-// wxDataFormat
+// wxDataType (internal)
 //-------------------------------------------------------------------------
 
 enum wxDataType
@@ -57,6 +57,10 @@ enum wxDataType
   wxDF_PRIVATE =          20
 };
 
+//-------------------------------------------------------------------------
+// wxDataFormat (internal)
+//-------------------------------------------------------------------------
+
 class wxDataFormat : public wxObject
 {
   DECLARE_CLASS( wxDataFormat )
@@ -66,6 +70,7 @@ public:
   wxDataFormat();
   wxDataFormat( wxDataType type );
   wxDataFormat( const wxString &id );
+  wxDataFormat( const wxChar *id );
   wxDataFormat( wxDataFormat &format );
   wxDataFormat( const GdkAtom atom );
 
@@ -73,10 +78,10 @@ public:
   wxDataType GetType() const;
   
   wxString GetId() const;
-  void SetId( const wxString &id );
+  void SetId( const wxChar *id );
   
   GdkAtom GetAtom();
-      
+  void SetAtom(GdkAtom atom) { m_hasAtom = TRUE; m_atom = atom; }
 private:
 
   wxDataType  m_type;
@@ -86,7 +91,7 @@ private:
 };
 
 //-------------------------------------------------------------------------
-// wxDataBroker handles data and ormat negotiation for clipboard and DnD
+// wxDataBroker (internal)
 //-------------------------------------------------------------------------
 
 class wxDataBroker : public wxObject