projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ 1518434 ] wxSize::Scale with wxScale and wxPoint operators documented
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dataform.h
diff --git
a/include/wx/gtk1/dataform.h
b/include/wx/gtk1/dataform.h
index a0618e01af5761bb53481c6d630e325d6652fe8e..5cb61dce26dd7847aae2f7177b26c5f06b03c575 100644
(file)
--- a/
include/wx/gtk1/dataform.h
+++ b/
include/wx/gtk1/dataform.h
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name:
gtk
/dataform.h
+// Name:
wx/gtk1
/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Vadim Zeitlin
// Modified by:
// Purpose: declaration of the wxDataFormat class
// Author: Vadim Zeitlin
// Modified by:
@@
-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; }
@@
-32,6
+34,10
@@
public:
{ return m_format == (NativeFormat)format; }
bool operator!=(NativeFormat format) const
{ return m_format != (NativeFormat)format; }
{ 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
// explicit and implicit conversions to NativeFormat which is one of
// standard data types (implicit conversion is useful for preserving the
@@
-48,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