Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide overloads for all kinds of strings for wxDataFormat ctor to allow passing strings as formats implicitly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-04 12:50:43 +00:00
parent 0a7ce61e65
commit 45344b3880
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/gtk/dataform.h
View File

@@ -20,9 +20,15 @@ public:
wxDataFormat();
wxDataFormat( wxDataFormatId type );
wxDataFormat( const wxString &id );
wxDataFormat( NativeFormat format );
// we have to provide all the overloads to allow using strings instead of
// data formats (as a lot of existing code does)
wxDataFormat( const wxString& id ) { InitFromString(id); }
wxDataFormat( const char *id ) { InitFromString(id); }
wxDataFormat( const wchar_t *id ) { InitFromString(id); }
wxDataFormat( const wxCStrData& id ) { InitFromString(id); }
wxDataFormat& operator=(const wxDataFormat& format)
{ m_type = format.m_type; m_format = format.m_format; return *this; }
wxDataFormat& operator=(NativeFormat format)
@@ -56,6 +62,9 @@ public:
void SetType( wxDataFormatId type );
private:
// common part of ctors from format name
void InitFromString(const wxString& id);
wxDataFormatId m_type;
NativeFormat m_format;

12
include/wx/gtk1/dataform.h
View File

@@ -20,9 +20,16 @@ public:
wxDataFormat();
wxDataFormat( wxDataFormatId type );
wxDataFormat( const wxString &id );
wxDataFormat( NativeFormat format );
// we have to provide all the overloads to allow using strings instead of
// data formats (as a lot of existing code does)
wxDataFormat( const wxString& id ) { InitFromString(id); }
wxDataFormat( const char *id ) { InitFromString(id); }
wxDataFormat( const wchar_t *id ) { InitFromString(id); }
wxDataFormat( const wxCStrData& id ) { InitFromString(id); }
wxDataFormat& operator=(const wxDataFormat& format)
{ m_type = format.m_type; m_format = format.m_format; return *this; }
wxDataFormat& operator=(NativeFormat format)
@@ -56,6 +63,9 @@ public:
void SetType( wxDataFormatId type );
private:
// common part of ctors from format name
void InitFromString(const wxString& id);
wxDataFormatId m_type;
NativeFormat m_format;

2
src/gtk/dataobj.cpp
View File

@@ -58,7 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
SetType( type );
}
wxDataFormat::wxDataFormat( const wxString &id )
void wxDataFormat::InitFromString( const wxString &id )
{
PrepareFormats();
SetId( id );

2
src/gtk1/dataobj.cpp
View File

@@ -58,7 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
SetType( type );
}
wxDataFormat::wxDataFormat( const wxString &id )
void wxDataFormat::InitFromString( const wxString &id )
{
PrepareFormats();
SetId( id );