merge of wxMac into main repository

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2000-08-09 11:02:59 +00:00
parent 30a70b29ce
commit 05adb9d2fd
22 changed files with 636 additions and 531 deletions

View File

@@ -1,22 +1,21 @@
///////////////////////////////////////////////////////////////////////////////
// Name: os2/dataform.h
// Name: mac/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: David Webster (lifted from dnd.h)
// Author: Stefan Csomor (lifted from dnd.h)
// Modified by:
// Created: 10/21/99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
// Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_OS2_DATAFORM_H
#define _WX_OS2_DATAFORM_H
#ifndef _WX_MAC_DATAFORM_H
#define _WX_MAC_DATAFORM_H
class wxDataFormat
{
public:
// the clipboard formats under GDK are GdkAtoms
typedef unsigned short NativeFormat;
typedef OSType NativeFormat;
wxDataFormat();
wxDataFormat(wxDataFormatId vType);
@@ -28,18 +27,22 @@ public:
{ SetId(vFormat); return *this; }
// comparison (must have both versions)
bool operator==(NativeFormat vFormat) const
{ return m_vFormat == (NativeFormat)vFormat; }
bool operator!=(NativeFormat vFormat) const
{ return m_vFormat != (NativeFormat)vFormat; }
bool operator==(NativeFormat format) const
{ return m_format == (NativeFormat)format; }
bool operator!=(NativeFormat format) const
{ return m_format != (NativeFormat)format; }
bool operator==(wxDataFormatId format) const
{ return m_type == (wxDataFormatId)format; }
bool operator!=(wxDataFormatId format) const
{ return m_type != (wxDataFormatId)format; }
// 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_vFormat; }
operator NativeFormat() const { return m_vFormat; }
NativeFormat GetFormatId() const { return m_format; }
operator NativeFormat() const { return m_format; }
void SetId(NativeFormat vFormat);
void SetId(NativeFormat format);
// string ids are used for custom types - this SetId() must be used for
// application-specific formats
@@ -48,13 +51,11 @@ public:
// implementation
wxDataFormatId GetType() const;
void SetType( wxDataFormatId type );
private:
wxDataFormatId m_vType;
NativeFormat m_vFormat;
void PrepareFormats();
void SetType(wxDataFormatId vType);
wxDataFormatId m_type;
NativeFormat m_format;
};
#endif // _WX_GTK_DATAFORM_H
#endif // _WX_MAC_DATAFORM_H