Use wxASCII_STR() on string literals
Fix the build with wxNO_IMPLICIT_WXSTRING_ENCODING.
This commit is contained in:
committed by
Vadim Zeitlin
parent
65cbf40b7e
commit
c86bcf962d
@@ -25,14 +25,14 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxStaticBitmapNameStr );
|
||||
const wxString& name = wxASCII_STR(wxStaticBitmapNameStr) );
|
||||
bool Create( wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxBitmap& label,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxStaticBitmapNameStr);
|
||||
const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
|
||||
|
||||
virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }
|
||||
virtual void SetBitmap( const wxBitmap& bitmap );
|
||||
|
Reference in New Issue
Block a user