use 6px as the default wxSizer border in wxGTK to be a little bit closer to GNOME HIG

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

diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h
index c58ec935beb798700b9daf7dee80e566cdba201e..b28d0594037cb8e0b72af66db4edb81a207aa476 100644 (file)
--- a/include/wx/os2/dataform.h
+++ b/include/wx/os2/dataform.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_DATAFORM_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_DATAFORM_H


@@ -16,7 +16,7 @@ class wxDataFormat
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }

-    wxDataFormat(const wxChar* zFormat) { SetId(zFormat); }
+    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }

 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }


@@ -42,7 +42,7 @@ public:
     // application-specific formats
     //
     wxString GetId(void) const;
     // application-specific formats
     //
     wxString GetId(void) const;

-    void     SetId(const wxChar* pId);
+    void     SetId(const wxString& pId);

 
 private:
     unsigned int                    m_uFormat;
 
 private:
     unsigned int                    m_uFormat;