Remove wxUSE_UNICODE checks as they're always true now
Also remove all code guarded by "#if !wxUSE_UNICODE".
This commit is contained in:
parent
5c49448c75
commit
4519d8e08a
195 changed files with 400 additions and 3509 deletions
|
|
@ -315,13 +315,11 @@ private:
|
|||
// wxTextDataObject contains text data
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXQT__)
|
||||
#define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
|
||||
#elif defined(__WXMAC__)
|
||||
#define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ
|
||||
#endif
|
||||
#endif // wxUSE_UNICODE
|
||||
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXQT__)
|
||||
#define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
|
||||
#elif defined(__WXMAC__)
|
||||
#define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxHTMLDataObject : public wxDataObjectSimple
|
||||
{
|
||||
|
|
@ -368,13 +366,7 @@ public:
|
|||
// ctor: you can specify the text here or in SetText(), or override
|
||||
// GetText()
|
||||
wxTextDataObject(const wxString& text = wxEmptyString)
|
||||
: wxDataObjectSimple(
|
||||
#if wxUSE_UNICODE
|
||||
wxDF_UNICODETEXT
|
||||
#else
|
||||
wxDF_TEXT
|
||||
#endif
|
||||
),
|
||||
: wxDataObjectSimple(wxDF_UNICODETEXT),
|
||||
m_text(text)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue