use wxString, not wxChar*, in wxDataFormat ctor and SetId() method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -16,7 +16,7 @@ class wxDataFormat
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
    wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
 | 
			
		||||
    wxDataFormat(const wxChar* zFormat) { SetId(zFormat); }
 | 
			
		||||
    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }
 | 
			
		||||
 | 
			
		||||
    wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
 | 
			
		||||
    wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
 | 
			
		||||
@@ -42,7 +42,7 @@ public:
 | 
			
		||||
    // application-specific formats
 | 
			
		||||
    //
 | 
			
		||||
    wxString GetId(void) const;
 | 
			
		||||
    void     SetId(const wxChar* pId);
 | 
			
		||||
    void     SetId(const wxString& pId);
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    unsigned int                    m_uFormat;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user