projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch from SF on menu command not blocked
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dataform.h
diff --git
a/include/wx/gtk1/dataform.h
b/include/wx/gtk1/dataform.h
index 9da24dd2577100c6bf83eeb9266a2006e1322035..00b2c9f0c0a1ef400d83ed9fad2d71baaaab4eb4 100644
(file)
--- a/
include/wx/gtk1/dataform.h
+++ b/
include/wx/gtk1/dataform.h
@@
-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; }
@@
-52,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