X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e1a688e3e9c6c265620e4f05d579077367e9fdb..a82dede09685decde50e8148ff8767984b70474f:/include/wx/os2/dataform.h diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h index 2bcddb8680..1b5b229e1a 100644 --- a/include/wx/os2/dataform.h +++ b/include/wx/os2/dataform.h @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/dataform.h +// Name: mac/dataform.h // Purpose: declaration of the wxDataFormat class -// Author: David Webster (lifted from dnd.h) +// Author: Stefan Csomor // Modified by: // Created: 10/21/99 // RCS-ID: $Id$ -// Copyright: (c) 1999 David Webster +// Copyright: (c) 1999 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -19,42 +19,42 @@ public: typedef unsigned short NativeFormat; wxDataFormat(); - wxDataFormat( wxDataFormatId type ); - wxDataFormat( const wxString &id ); - wxDataFormat( const wxChar *id ); - wxDataFormat( NativeFormat format ); + wxDataFormat(wxDataFormatId vType); + wxDataFormat(const wxString& rId); + wxDataFormat(const wxChar* pId); + wxDataFormat(NativeFormat vFormat); - wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } + wxDataFormat& operator=(NativeFormat vFormat) + { SetId(vFormat); return *this; } // comparison (must have both versions) - bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } - bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } + bool operator==(NativeFormat vFormat) const + { return m_vFormat == (NativeFormat)vFormat; } + bool operator!=(NativeFormat vFormat) const + { return m_vFormat != (NativeFormat)vFormat; } // explicit and implicit conversions to NativeFormat which is one of // standard data types (implicit conversion is useful for preserving the // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } + NativeFormat GetFormatId() const { return m_vFormat; } + operator NativeFormat() const { return m_vFormat; } - void SetId( NativeFormat format ); + void SetId(NativeFormat vFormat); // string ids are used for custom types - this SetId() must be used for // application-specific formats wxString GetId() const; - void SetId( const wxChar *id ); + void SetId(const wxChar* pId); // implementation wxDataFormatId GetType() const; private: - wxDataFormatId m_type; - NativeFormat m_format; + wxDataFormatId m_vType; + NativeFormat m_vFormat; void PrepareFormats(); - void SetType( wxDataFormatId type ); + void SetType(wxDataFormatId vType); }; #endif // _WX_GTK_DATAFORM_H