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

Use wxASCII_STR() on string literals

Browse Source 
Fix the build with wxNO_IMPLICIT_WXSTRING_ENCODING.
This commit is contained in:
Arrigo Marchiori
2019-10-22 12:34:29 +02:00
committed by Vadim Zeitlin
parent 65cbf40b7e
commit c86bcf962d
351 changed files with 965 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/addremovectrl.h
View File

@@ -66,7 +66,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxAddRemoveCtrlNameStr) const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr))
{ {
Init(); Init();
@@ -78,7 +78,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxAddRemoveCtrlNameStr); const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr));
virtual ~wxAddRemoveCtrl(); virtual ~wxAddRemoveCtrl();

2
include/wx/animate.h
View File

@@ -171,7 +171,7 @@ protected:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAC_DEFAULT_STYLE, long style = wxAC_DEFAULT_STYLE,
const wxString& name = wxAnimationCtrlNameStr) const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
: wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name) : wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name)
{} {}

2
include/wx/artprov.h
View File

@@ -30,7 +30,7 @@ typedef wxString wxArtID;
#define wxART_MAKE_CLIENT_ID_FROM_STR(id) ((id) + wxASCII_STR("_C")) #define wxART_MAKE_CLIENT_ID_FROM_STR(id) ((id) + wxASCII_STR("_C"))
#define wxART_MAKE_CLIENT_ID(id) wxASCII_STR(#id "_C") #define wxART_MAKE_CLIENT_ID(id) wxASCII_STR(#id "_C")
#define wxART_MAKE_ART_ID_FROM_STR(id) (id) #define wxART_MAKE_ART_ID_FROM_STR(id) (id)
#define wxART_MAKE_ART_ID(id) (#id) #define wxART_MAKE_ART_ID(id) wxASCII_STR(#id)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Art clients // Art clients

8
include/wx/aui/tabmdi.h
View File

@@ -46,7 +46,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
~wxAuiMDIParentFrame(); ~wxAuiMDIParentFrame();
@@ -56,7 +56,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr ); const wxString& name = wxASCII_STR(wxFrameNameStr) );
void SetArtProvider(wxAuiTabArt* provider); void SetArtProvider(wxAuiTabArt* provider);
wxAuiTabArt* GetArtProvider(); wxAuiTabArt* GetArtProvider();
@@ -131,7 +131,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual ~wxAuiMDIChildFrame(); virtual ~wxAuiMDIChildFrame();
bool Create(wxAuiMDIParentFrame *parent, bool Create(wxAuiMDIParentFrame *parent,
@@ -140,7 +140,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE; virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE;

4
include/wx/bannerwindow.h
View File

@@ -54,7 +54,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxBannerWindowNameStr) const wxString& name = wxASCII_STR(wxBannerWindowNameStr))
{ {
Init(); Init();
@@ -68,7 +68,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxBannerWindowNameStr); const wxString& name = wxASCII_STR(wxBannerWindowNameStr));
// Provide an existing bitmap to show. For wxLEFT orientation the bitmap is // Provide an existing bitmap to show. For wxLEFT orientation the bitmap is

2
include/wx/base64.h
View File

@@ -42,7 +42,7 @@ inline wxString wxBase64Encode(const void *src, size_t srcLen)
wxCharBuffer dst(dstLen); wxCharBuffer dst(dstLen);
wxBase64Encode(dst.data(), dstLen, src, srcLen); wxBase64Encode(dst.data(), dstLen, src, srcLen);
return dst; return wxASCII_STR(dst);
} }
inline wxString wxBase64Encode(const wxMemoryBuffer& buf) inline wxString wxBase64Encode(const wxMemoryBuffer& buf)

4
include/wx/clrpicker.h
View File

@@ -108,7 +108,7 @@ public:
const wxColour& col = *wxBLACK, const wxPoint& pos = wxDefaultPosition, const wxColour& col = *wxBLACK, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerCtrlNameStr) const wxString& name = wxASCII_STR(wxColourPickerCtrlNameStr))
{ Create(parent, id, col, pos, size, style, validator, name); } { Create(parent, id, col, pos, size, style, validator, name); }
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
@@ -117,7 +117,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCLRP_DEFAULT_STYLE, long style = wxCLRP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerCtrlNameStr); const wxString& name = wxASCII_STR(wxColourPickerCtrlNameStr));
public: // public API public: // public API

6
include/wx/collheaderctrl.h
View File

@@ -35,7 +35,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE, long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr) const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
@@ -47,7 +47,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE, long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr) const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{ {
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false; return false;
@@ -91,7 +91,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE, long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr) const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }

8
include/wx/commandlinkbutton.h
View File

@@ -40,7 +40,7 @@ public:
long style = 0, long style = 0,
const wxValidator& validator = const wxValidator& validator =
wxDefaultValidator, wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxASCII_STR(wxButtonNameStr))
: wxButton(parent, : wxButton(parent,
id, id,
mainLabel + '\n' + note, mainLabel + '\n' + note,
@@ -103,7 +103,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxASCII_STR(wxButtonNameStr))
: wxCommandLinkButtonBase() : wxCommandLinkButtonBase()
{ {
Create(parent, id, mainLabel, note, pos, size, style, validator, name); Create(parent, id, mainLabel, note, pos, size, style, validator, name);
@@ -117,7 +117,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxASCII_STR(wxButtonNameStr));
virtual void SetMainLabelAndNote(const wxString& mainLabel, virtual void SetMainLabelAndNote(const wxString& mainLabel,
const wxString& note) wxOVERRIDE const wxString& note) wxOVERRIDE
@@ -147,7 +147,7 @@ private:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxASCII_STR(wxButtonNameStr))
: wxGenericCommandLinkButton(parent, : wxGenericCommandLinkButton(parent,
id, id,
mainLabel, mainLabel,

2
include/wx/control.h
View File

@@ -42,7 +42,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr); const wxString& name = wxASCII_STR(wxControlNameStr));
// get the control alignment (left/right/centre, top/bottom/centre) // get the control alignment (left/right/centre, top/bottom/centre)
int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }

14
include/wx/datetime.h
View File

@@ -955,7 +955,7 @@ public:
bool ParseFormat(const wxString& date, bool ParseFormat(const wxString& date,
wxString::const_iterator *end) wxString::const_iterator *end)
{ {
return ParseFormat(date, wxDefaultDateTimeFormat, wxDefaultDateTime, end); return ParseFormat(date, wxASCII_STR(wxDefaultDateTimeFormat), wxDefaultDateTime, end);
} }
// parse a string containing date, time or both in ISO 8601 format // parse a string containing date, time or both in ISO 8601 format
@@ -1000,7 +1000,7 @@ public:
// argument corresponds to the preferred date and time representation // argument corresponds to the preferred date and time representation
// for the current locale) and returns the string containing the // for the current locale) and returns the string containing the
// resulting text representation // resulting text representation
wxString Format(const wxString& format = wxDefaultDateTimeFormat, wxString Format(const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
const TimeZone& tz = Local) const; const TimeZone& tz = Local) const;
// preferred date representation for the current locale // preferred date representation for the current locale
wxString FormatDate() const { return Format(wxS("%x")); } wxString FormatDate() const { return Format(wxS("%x")); }
@@ -1035,7 +1035,7 @@ public:
} }
wxAnyStrPtr ParseFormat(const wxString& date, wxAnyStrPtr ParseFormat(const wxString& date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
const wxDateTime& dateDef = wxDefaultDateTime) const wxDateTime& dateDef = wxDefaultDateTime)
{ {
wxString::const_iterator end; wxString::const_iterator end;
@@ -1084,14 +1084,14 @@ public:
const wchar_t* ParseRfc822Date(const wchar_t* date); const wchar_t* ParseRfc822Date(const wchar_t* date);
void ParseFormat(const wxCStrData& date, void ParseFormat(const wxCStrData& date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
const wxDateTime& dateDef = wxDefaultDateTime) const wxDateTime& dateDef = wxDefaultDateTime)
{ ParseFormat(wxString(date), format, dateDef); } { ParseFormat(wxString(date), format, dateDef); }
const char* ParseFormat(const char* date, const char* ParseFormat(const char* date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
const wxDateTime& dateDef = wxDefaultDateTime); const wxDateTime& dateDef = wxDefaultDateTime);
const wchar_t* ParseFormat(const wchar_t* date, const wchar_t* ParseFormat(const wchar_t* date,
const wxString& format = wxDefaultDateTimeFormat, const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
const wxDateTime& dateDef = wxDefaultDateTime); const wxDateTime& dateDef = wxDefaultDateTime);
void ParseDateTime(const wxCStrData& datetime) void ParseDateTime(const wxCStrData& datetime)
@@ -1337,7 +1337,7 @@ public:
// resulting text representation. Notice that only some of format // resulting text representation. Notice that only some of format
// specifiers valid for wxDateTime are valid for wxTimeSpan: hours, // specifiers valid for wxDateTime are valid for wxTimeSpan: hours,
// minutes and seconds make sense, but not "PM/AM" string for example. // minutes and seconds make sense, but not "PM/AM" string for example.
wxString Format(const wxString& format = wxDefaultTimeSpanFormat) const; wxString Format(const wxString& format = wxASCII_STR(wxDefaultTimeSpanFormat)) const;
// implementation // implementation
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

4
include/wx/dfb/nonownedwnd.h
View File

@@ -38,7 +38,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr) const wxString& name = wxASCII_STR(wxPanelNameStr))
{ {
Init(); Init();
@@ -50,7 +50,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxASCII_STR(wxPanelNameStr));
virtual ~wxNonOwnedWindow(); virtual ~wxNonOwnedWindow();

4
include/wx/dfb/toplevel.h
View File

@@ -25,7 +25,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -38,7 +38,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
// implement base class pure virtuals // implement base class pure virtuals
virtual void Maximize(bool maximize = true); virtual void Maximize(bool maximize = true);

4
include/wx/dfb/window.h
View File

@@ -39,7 +39,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr) const wxString& name = wxASCII_STR(wxPanelNameStr))
{ {
Init(); Init();
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
@@ -52,7 +52,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxASCII_STR(wxPanelNameStr));
// implement base class (pure) virtual methods // implement base class (pure) virtual methods
// ------------------------------------------- // -------------------------------------------

10
include/wx/dirdlg.h
View File

@@ -56,12 +56,12 @@ class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
public: public:
wxDirDialogBase() {} wxDirDialogBase() {}
wxDirDialogBase(wxWindow *parent, wxDirDialogBase(wxWindow *parent,
const wxString& title = wxDirSelectorPromptStr, const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxDirDialogNameStr) const wxString& name = wxASCII_STR(wxDirDialogNameStr))
{ {
Create(parent, title, defaultPath, style, pos, sz, name); Create(parent, title, defaultPath, style, pos, sz, name);
} }
@@ -70,12 +70,12 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& title = wxDirSelectorPromptStr, const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxDirDialogNameStr) const wxString& name = wxASCII_STR(wxDirDialogNameStr))
{ {
if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name)) if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name))
return false; return false;
@@ -136,7 +136,7 @@ protected:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLIMPEXP_CORE wxString WXDLLIMPEXP_CORE wxString
wxDirSelector(const wxString& message = wxDirSelectorPromptStr, wxDirSelector(const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
include/wx/docmdi.h
View File

@@ -41,7 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
: wxDocMDIParentFrameBase(manager, : wxDocMDIParentFrameBase(manager,
parent, id, title, pos, size, style, name) parent, id, title, pos, size, style, name)
{ {
@@ -72,7 +72,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
: wxDocMDIChildFrameBase(doc, view, : wxDocMDIChildFrameBase(doc, view,
parent, id, title, pos, size, style, name) parent, id, title, pos, size, style, name)
{ {

16
include/wx/docview.h
View File

@@ -691,7 +691,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Create(doc, view, parent, id, title, pos, size, style, name); Create(doc, view, parent, id, title, pos, size, style, name);
} }
@@ -704,7 +704,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
if ( !wxDocChildFrameAnyBase::Create(doc, view, this) ) if ( !wxDocChildFrameAnyBase::Create(doc, view, this) )
return false; return false;
@@ -767,7 +767,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
: wxDocChildFrameBase(doc, view, : wxDocChildFrameBase(doc, view,
parent, id, title, pos, size, style, name) parent, id, title, pos, size, style, name)
{ {
@@ -781,7 +781,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
return wxDocChildFrameBase::Create return wxDocChildFrameBase::Create
( (
@@ -845,7 +845,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
: wxDocParentFrameAnyBase(this) : wxDocParentFrameAnyBase(this)
{ {
Create(manager, frame, id, title, pos, size, style, name); Create(manager, frame, id, title, pos, size, style, name);
@@ -858,7 +858,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
m_docManager = manager; m_docManager = manager;
@@ -920,7 +920,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
: wxDocParentFrameBase(manager, : wxDocParentFrameBase(manager,
parent, id, title, pos, size, style, name) parent, id, title, pos, size, style, name)
{ {
@@ -933,7 +933,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
return wxDocParentFrameBase::Create(manager, return wxDocParentFrameBase::Create(manager,
parent, id, title, parent, id, title,

2
include/wx/dvrenderers.h
View File

@@ -300,7 +300,7 @@ class WXDLLIMPEXP_CORE wxDataViewCustomRendererBase
public: public:
// Constructor must specify the usual renderer parameters which we simply // Constructor must specify the usual renderer parameters which we simply
// pass to the base class // pass to the base class
wxDataViewCustomRendererBase(const wxString& varianttype = "string", wxDataViewCustomRendererBase(const wxString& varianttype = wxASCII_STR("string"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT) int align = wxDVR_DEFAULT_ALIGNMENT)
: wxDataViewCustomRendererRealBase(varianttype, mode, align) : wxDataViewCustomRendererRealBase(varianttype, mode, align)

4
include/wx/editlbox.h
View File

@@ -41,7 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxEL_DEFAULT_STYLE, long style = wxEL_DEFAULT_STYLE,
const wxString& name = wxEditableListBoxNameStr) const wxString& name = wxASCII_STR(wxEditableListBoxNameStr))
{ {
Init(); Init();
Create(parent, id, label, pos, size, style, name); Create(parent, id, label, pos, size, style, name);
@@ -52,7 +52,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxEL_DEFAULT_STYLE, long style = wxEL_DEFAULT_STYLE,
const wxString& name = wxEditableListBoxNameStr); const wxString& name = wxASCII_STR(wxEditableListBoxNameStr));
void SetStrings(const wxArrayString& strings); void SetStrings(const wxArrayString& strings);
void GetStrings(wxArrayString& strings) const; void GetStrings(wxArrayString& strings) const;

20
include/wx/filedlg.h
View File

@@ -68,14 +68,14 @@ public:
wxFileDialogBase () { Init(); } wxFileDialogBase () { Init(); }
wxFileDialogBase(wxWindow *parent, wxFileDialogBase(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr) const wxString& name = wxASCII_STR(wxFileDialogNameStr))
{ {
Init(); Init();
Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name); Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name);
@@ -85,14 +85,14 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); const wxString& name = wxASCII_STR(wxFileDialogNameStr));
bool HasFdFlag(int flag) const { return HasFlag(flag); } bool HasFdFlag(int flag) const { return HasFlag(flag); }
@@ -197,22 +197,22 @@ private:
// File selector - backward compatibility // File selector - backward compatibility
WXDLLIMPEXP_CORE wxString WXDLLIMPEXP_CORE wxString
wxFileSelector(const wxString& message = wxFileSelectorPromptStr, wxFileSelector(const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& default_path = wxEmptyString, const wxString& default_path = wxEmptyString,
const wxString& default_filename = wxEmptyString, const wxString& default_filename = wxEmptyString,
const wxString& default_extension = wxEmptyString, const wxString& default_extension = wxEmptyString,
const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
int flags = 0, int flags = 0,
wxWindow *parent = NULL, wxWindow *parent = NULL,
int x = wxDefaultCoord, int y = wxDefaultCoord); int x = wxDefaultCoord, int y = wxDefaultCoord);
// An extended version of wxFileSelector // An extended version of wxFileSelector
WXDLLIMPEXP_CORE wxString WXDLLIMPEXP_CORE wxString
wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, wxFileSelectorEx(const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& default_path = wxEmptyString, const wxString& default_path = wxEmptyString,
const wxString& default_filename = wxEmptyString, const wxString& default_filename = wxEmptyString,
int *indexDefaultExtension = NULL, int *indexDefaultExtension = NULL,
const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
int flags = 0, int flags = 0,
wxWindow *parent = NULL, wxWindow *parent = NULL,
int x = wxDefaultCoord, int y = wxDefaultCoord); int x = wxDefaultCoord, int y = wxDefaultCoord);

6
include/wx/filename.h
View File

@@ -406,7 +406,7 @@ public:
// fn.ReplaceEnvVariable("OPENWINHOME"); // fn.ReplaceEnvVariable("OPENWINHOME");
// // now fn.GetFullPath() == "$OPENWINHOME/lib/someFile" // // now fn.GetFullPath() == "$OPENWINHOME/lib/someFile"
bool ReplaceEnvVariable(const wxString& envname, bool ReplaceEnvVariable(const wxString& envname,
const wxString& replacementFmtString = "$%s", const wxString& replacementFmtString = wxS("$%s"),
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
// replaces, if present in the path, the home directory for the given user // replaces, if present in the path, the home directory for the given user
@@ -575,12 +575,12 @@ public:
// returns the size in a human readable form // returns the size in a human readable form
wxString wxString
GetHumanReadableSize(const wxString& nullsize = wxGetTranslation("Not available"), GetHumanReadableSize(const wxString& nullsize = wxGetTranslation(wxASCII_STR("Not available")),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const; wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
static wxString static wxString
GetHumanReadableSize(const wxULongLong& sz, GetHumanReadableSize(const wxULongLong& sz,
const wxString& nullsize = wxGetTranslation("Not available"), const wxString& nullsize = wxGetTranslation(wxASCII_STR("Not available")),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL); wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
#endif // wxUSE_LONGLONG #endif // wxUSE_LONGLONG

20
include/wx/filepicker.h
View File

@@ -235,13 +235,13 @@ public:
wxFilePickerCtrl(wxWindow *parent, wxFilePickerCtrl(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFLP_DEFAULT_STYLE, long style = wxFLP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerCtrlNameStr) const wxString& name = wxASCII_STR(wxFilePickerCtrlNameStr))
{ {
Create(parent, id, path, message, wildcard, pos, size, style, Create(parent, id, path, message, wildcard, pos, size, style,
validator, name); validator, name);
@@ -250,13 +250,13 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFLP_DEFAULT_STYLE, long style = wxFLP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerCtrlNameStr); const wxString& name = wxASCII_STR(wxFilePickerCtrlNameStr));
void SetFileName(const wxFileName &filename) void SetFileName(const wxFileName &filename)
{ SetPath(filename.GetFullPath()); } { SetPath(filename.GetFullPath()); }
@@ -339,24 +339,24 @@ public:
wxDirPickerCtrl(wxWindow *parent, wxWindowID id, wxDirPickerCtrl(wxWindow *parent, wxWindowID id,
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString& message = wxDirSelectorPromptStr, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRP_DEFAULT_STYLE, long style = wxDIRP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDirPickerCtrlNameStr) const wxString& name = wxASCII_STR(wxDirPickerCtrlNameStr))
{ {
Create(parent, id, path, message, pos, size, style, validator, name); Create(parent, id, path, message, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString& message = wxDirSelectorPromptStr, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRP_DEFAULT_STYLE, long style = wxDIRP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDirPickerCtrlNameStr); const wxString& name = wxASCII_STR(wxDirPickerCtrlNameStr));
void SetDirName(const wxFileName &dirname) void SetDirName(const wxFileName &dirname)
{ SetPath(dirname.GetPath()); } { SetPath(dirname.GetPath()); }

4
include/wx/fontpicker.h
View File

@@ -117,7 +117,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFNTP_DEFAULT_STYLE, long style = wxFNTP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerCtrlNameStr) const wxString& name = wxASCII_STR(wxFontPickerCtrlNameStr))
: m_nMinPointSize(wxFNTP_MINPOINT_SIZE), m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE) : m_nMinPointSize(wxFNTP_MINPOINT_SIZE), m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
{ {
Create(parent, id, initial, pos, size, style, validator, name); Create(parent, id, initial, pos, size, style, validator, name);
@@ -130,7 +130,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFNTP_DEFAULT_STYLE, long style = wxFNTP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerCtrlNameStr); const wxString& name = wxASCII_STR(wxFontPickerCtrlNameStr));
public: // public API public: // public API

6
include/wx/frame.h
View File

@@ -66,7 +66,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
// frame state // frame state
// ----------- // -----------
@@ -109,7 +109,7 @@ public:
virtual wxStatusBar* CreateStatusBar(int number = 1, virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
wxWindowID winid = 0, wxWindowID winid = 0,
const wxString& name = wxStatusLineNameStr); const wxString& name = wxASCII_STR(wxStatusLineNameStr));
// return a new status bar // return a new status bar
virtual wxStatusBar *OnCreateStatusBar(int number, virtual wxStatusBar *OnCreateStatusBar(int number,
long style, long style,
@@ -139,7 +139,7 @@ public:
// create main toolbar bycalling OnCreateToolBar() // create main toolbar bycalling OnCreateToolBar()
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
const wxString& name = wxToolBarNameStr); const wxString& name = wxASCII_STR(wxToolBarNameStr));
// return a new toolbar // return a new toolbar
virtual wxToolBar *OnCreateToolBar(long style, virtual wxToolBar *OnCreateToolBar(long style,
wxWindowID winid, wxWindowID winid,

2
include/wx/fswatcher.h
View File

@@ -373,7 +373,7 @@ protected:
wxFileName path_copy = wxFileName(path); wxFileName path_copy = wxFileName(path);
if ( !path_copy.Normalize() ) if ( !path_copy.Normalize() )
{ {
wxFAIL_MSG(wxString::Format("Unable to normalize path '%s'", wxFAIL_MSG(wxString::Format(wxASCII_STR("Unable to normalize path '%s'"),
path.GetFullPath())); path.GetFullPath()));
return wxEmptyString; return wxEmptyString;
} }

2
include/wx/gauge.h
View File

@@ -66,7 +66,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr); const wxString& name = wxASCII_STR(wxGaugeNameStr));
// determinate mode API // determinate mode API

4
include/wx/generic/animate.h
View File

@@ -28,7 +28,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAC_DEFAULT_STYLE, long style = wxAC_DEFAULT_STYLE,
const wxString& name = wxAnimationCtrlNameStr) const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
{ {
Init(); Init();
@@ -42,7 +42,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAC_DEFAULT_STYLE, long style = wxAC_DEFAULT_STYLE,
const wxString& name = wxAnimationCtrlNameStr); const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr));
~wxGenericAnimationCtrl(); ~wxGenericAnimationCtrl();

8
include/wx/generic/bmpcbox.h
View File

@@ -41,7 +41,7 @@ public:
const wxString choices[] = NULL, const wxString choices[] = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr) const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr))
: wxOwnerDrawnComboBox(), : wxOwnerDrawnComboBox(),
wxBitmapComboBoxBase() wxBitmapComboBoxBase()
{ {
@@ -59,7 +59,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style, long style,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -70,7 +70,7 @@ public:
const wxString choices[], const wxString choices[],
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -80,7 +80,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
virtual ~wxBitmapComboBox(); virtual ~wxBitmapComboBox();

4
include/wx/generic/buttonbar.h
View File

@@ -31,7 +31,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxToolBarNameStr) const wxString& name = wxASCII_STR(wxToolBarNameStr))
{ {
Init(); Init();
@@ -43,7 +43,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxToolBarNameStr ); const wxString& name = wxASCII_STR(wxToolBarNameStr) );
virtual ~wxButtonToolBar(); virtual ~wxButtonToolBar();

4
include/wx/generic/calctrlg.h
View File

@@ -34,7 +34,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr); const wxString& name = wxASCII_STR(wxCalendarNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -42,7 +42,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr); const wxString& name = wxASCII_STR(wxCalendarNameStr));
virtual ~wxGenericCalendarCtrl(); virtual ~wxGenericCalendarCtrl();

4
include/wx/generic/clrpickerg.h
View File

@@ -33,7 +33,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCLRBTN_DEFAULT_STYLE, long style = wxCLRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerWidgetNameStr) const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr))
{ {
Create(parent, id, col, pos, size, style, validator, name); Create(parent, id, col, pos, size, style, validator, name);
} }
@@ -59,7 +59,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCLRBTN_DEFAULT_STYLE, long style = wxCLRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerWidgetNameStr); const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
void OnButtonClick(wxCommandEvent &); void OnButtonClick(wxCommandEvent &);

4
include/wx/generic/collheaderctrl.h
View File

@@ -23,7 +23,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE, long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr) const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
{ {
Init(); Init();
@@ -37,7 +37,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxBORDER_NONE, long style = wxBORDER_NONE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCollapsibleHeaderCtrlNameStr); const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr));
virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE; virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE;

4
include/wx/generic/collpaneg.h
View File

@@ -33,7 +33,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCP_DEFAULT_STYLE, long style = wxCP_DEFAULT_STYLE,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr) const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr))
{ {
Init(); Init();
@@ -49,7 +49,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCP_DEFAULT_STYLE, long style = wxCP_DEFAULT_STYLE,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr); const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr));
// public wxCollapsiblePane API // public wxCollapsiblePane API
virtual void Collapse(bool collapse = true) wxOVERRIDE; virtual void Collapse(bool collapse = true) wxOVERRIDE;

6
include/wx/generic/combo.h
View File

@@ -48,7 +48,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxASCII_STR(wxComboBoxNameStr))
{ {
Init(); Init();
@@ -62,7 +62,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxASCII_STR(wxComboBoxNameStr));
virtual ~wxGenericComboCtrl(); virtual ~wxGenericComboCtrl();
@@ -131,7 +131,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxASCII_STR(wxComboBoxNameStr))
: wxGenericComboCtrl() : wxGenericComboCtrl()
{ {
(void)Create(parent, id, value, pos, size, style, validator, name); (void)Create(parent, id, value, pos, size, style, validator, name);

4
include/wx/generic/dataview.h
View File

@@ -202,7 +202,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDataViewCtrlNameStr ) const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr) )
: wxScrollHelper(this) : wxScrollHelper(this)
{ {
Create(parent, id, pos, size, style, validator, name); Create(parent, id, pos, size, style, validator, name);
@@ -216,7 +216,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDataViewCtrlNameStr); const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr));
virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE; virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE;

8
include/wx/generic/dirctrlg.h
View File

@@ -83,26 +83,26 @@ class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl
public: public:
wxGenericDirCtrl(); wxGenericDirCtrl();
wxGenericDirCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, wxGenericDirCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxString &dir = wxDirDialogDefaultFolderStr, const wxString &dir = wxASCII_STR(wxDirDialogDefaultFolderStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_DEFAULT_STYLE, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr ) const wxString& name = wxASCII_STR(wxTreeCtrlNameStr) )
{ {
Init(); Init();
Create(parent, id, dir, pos, size, style, filter, defaultFilter, name); Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
} }
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxString &dir = wxDirDialogDefaultFolderStr, const wxString &dir = wxASCII_STR(wxDirDialogDefaultFolderStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_DEFAULT_STYLE, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr ); const wxString& name = wxASCII_STR(wxTreeCtrlNameStr) );
virtual void Init(); virtual void Init();

8
include/wx/generic/dirdlgg.h
View File

@@ -38,20 +38,20 @@ public:
wxGenericDirDialog() : wxDirDialogBase() { } wxGenericDirDialog() : wxDirDialogBase() { }
wxGenericDirDialog(wxWindow* parent, wxGenericDirDialog(wxWindow* parent,
const wxString& title = wxDirSelectorPromptStr, const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,//Size(450, 550), const wxSize& sz = wxDefaultSize,//Size(450, 550),
const wxString& name = wxDirDialogNameStr); const wxString& name = wxASCII_STR(wxDirDialogNameStr));
bool Create(wxWindow* parent, bool Create(wxWindow* parent,
const wxString& title = wxDirSelectorPromptStr, const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,//Size(450, 550), const wxSize& sz = wxDefaultSize,//Size(450, 550),
const wxString& name = wxDirDialogNameStr); const wxString& name = wxASCII_STR(wxDirDialogNameStr));
//// Accessors //// Accessors
void SetPath(const wxString& path) wxOVERRIDE; void SetPath(const wxString& path) wxOVERRIDE;

8
include/wx/generic/filectrlg.h
View File

@@ -195,11 +195,11 @@ public:
wxWindowID id, wxWindowID id,
const wxString& defaultDirectory = wxEmptyString, const wxString& defaultDirectory = wxEmptyString,
const wxString& defaultFilename = wxEmptyString, const wxString& defaultFilename = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFC_DEFAULT_STYLE, long style = wxFC_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxFileCtrlNameStr ) const wxString& name = wxASCII_STR(wxFileCtrlNameStr) )
{ {
m_ignoreChanges = false; m_ignoreChanges = false;
Create(parent, id, defaultDirectory, defaultFilename, wildCard, Create(parent, id, defaultDirectory, defaultFilename, wildCard,
@@ -212,11 +212,11 @@ public:
wxWindowID id, wxWindowID id,
const wxString& defaultDirectory = wxEmptyString, const wxString& defaultDirectory = wxEmptyString,
const wxString& defaultFileName = wxEmptyString, const wxString& defaultFileName = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFC_DEFAULT_STYLE, long style = wxFC_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxFileCtrlNameStr ); const wxString& name = wxASCII_STR(wxFileCtrlNameStr) );
virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE;
virtual void SetFilterIndex( int filterindex ) wxOVERRIDE; virtual void SetFilterIndex( int filterindex ) wxOVERRIDE;

16
include/wx/generic/filedlgg.h
View File

@@ -37,25 +37,25 @@ public:
wxGenericFileDialog() : wxFileDialogBase() { Init(); } wxGenericFileDialog() : wxFileDialogBase() { Init(); }
wxGenericFileDialog(wxWindow *parent, wxGenericFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr, const wxString& name = wxASCII_STR(wxFileDialogNameStr),
bool bypassGenericImpl = false ); bool bypassGenericImpl = false );
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr, const wxString& name = wxASCII_STR(wxFileDialogNameStr),
bool bypassGenericImpl = false ); bool bypassGenericImpl = false );
virtual ~wxGenericFileDialog(); virtual ~wxGenericFileDialog();
@@ -143,10 +143,10 @@ public:
wxFileDialog() {} wxFileDialog() {}
wxFileDialog(wxWindow *parent, wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = 0, long style = 0,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize) const wxSize& size = wxDefaultSize)

30
include/wx/generic/filepickerg.h
View File

@@ -31,15 +31,15 @@ public:
wxGenericFileDirButton() { Init(); } wxGenericFileDirButton() { Init(); }
wxGenericFileDirButton(wxWindow *parent, wxGenericFileDirButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
{ {
Init(); Init();
Create(parent, id, label, path, message, wildcard, Create(parent, id, label, path, message, wildcard,
@@ -62,15 +62,15 @@ public: // overridable
public: public:
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr); const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
// event handler for the click // event handler for the click
void OnButtonClick(wxCommandEvent &); void OnButtonClick(wxCommandEvent &);
@@ -104,15 +104,15 @@ public:
wxGenericFileButton() {} wxGenericFileButton() {}
wxGenericFileButton(wxWindow *parent, wxGenericFileButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFILEBTN_DEFAULT_STYLE, long style = wxFILEBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
{ {
Create(parent, id, label, path, message, wildcard, Create(parent, id, label, path, message, wildcard,
pos, size, style, validator, name); pos, size, style, validator, name);
@@ -172,14 +172,14 @@ public:
wxGenericDirButton() {} wxGenericDirButton() {}
wxGenericDirButton(wxWindow *parent, wxGenericDirButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxDirPickerWidgetLabel, const wxString& label = wxASCII_STR(wxDirPickerWidgetLabel),
const wxString& path = wxEmptyString, const wxString& path = wxEmptyString,
const wxString &message = wxDirSelectorPromptStr, const wxString &message = wxASCII_STR(wxDirSelectorPromptStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRBTN_DEFAULT_STYLE, long style = wxDIRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDirPickerWidgetNameStr) const wxString& name = wxASCII_STR(wxDirPickerWidgetNameStr))
{ {
Create(parent, id, label, path, message, wxEmptyString, Create(parent, id, label, path, message, wxEmptyString,
pos, size, style, validator, name); pos, size, style, validator, name);

4
include/wx/generic/fontpickerg.h
View File

@@ -30,7 +30,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFONTBTN_DEFAULT_STYLE, long style = wxFONTBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr))
{ {
Create(parent, id, initial, pos, size, style, validator, name); Create(parent, id, initial, pos, size, style, validator, name);
} }
@@ -62,7 +62,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFONTBTN_DEFAULT_STYLE, long style = wxFONTBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerWidgetNameStr); const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr));
void OnButtonClick(wxCommandEvent &); void OnButtonClick(wxCommandEvent &);

6
include/wx/generic/grid.h
View File

@@ -1480,7 +1480,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxGridNameStr) const wxString& name = wxASCII_STR(wxGridNameStr))
{ {
Init(); Init();
@@ -1492,7 +1492,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxGridNameStr); const wxString& name = wxASCII_STR(wxGridNameStr));
virtual ~wxGrid(); virtual ~wxGrid();
@@ -2354,7 +2354,7 @@ public:
wxGrid( wxWindow *parent, wxGrid( wxWindow *parent,
int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord, int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxPanelNameStr ) const wxString& name = wxASCII_STR(wxPanelNameStr) )
{ {
Init(); Init();
Create(parent, wxID_ANY, wxPoint(x, y), wxSize(w, h), style, name); Create(parent, wxID_ANY, wxPoint(x, y), wxSize(w, h), style, name);

4
include/wx/generic/gridctrl.h
View File

@@ -217,8 +217,8 @@ protected:
class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellDateRenderer class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellDateRenderer
{ {
public: public:
wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat, wxGridCellDateTimeRenderer(const wxString& outformat = wxASCII_STR(wxDefaultDateTimeFormat),
const wxString& informat = wxDefaultDateTimeFormat); const wxString& informat = wxASCII_STR(wxDefaultDateTimeFormat));
wxGridCellDateTimeRenderer(const wxGridCellDateTimeRenderer& other) wxGridCellDateTimeRenderer(const wxGridCellDateTimeRenderer& other)
: wxGridCellDateRenderer(other), : wxGridCellDateRenderer(other),

4
include/wx/generic/headerctrlg.h
View File

@@ -31,7 +31,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHD_DEFAULT_STYLE, long style = wxHD_DEFAULT_STYLE,
const wxString& name = wxHeaderCtrlNameStr) const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr))
{ {
Init(); Init();
@@ -43,7 +43,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHD_DEFAULT_STYLE, long style = wxHD_DEFAULT_STYLE,
const wxString& name = wxHeaderCtrlNameStr); const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr));
virtual ~wxHeaderCtrl(); virtual ~wxHeaderCtrl();

4
include/wx/generic/hyperlink.h
View File

@@ -28,7 +28,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHL_DEFAULT_STYLE, long style = wxHL_DEFAULT_STYLE,
const wxString& name = wxHyperlinkCtrlNameStr) const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr))
{ {
Init(); Init();
(void) Create(parent, id, label, url, pos, size, style, name); (void) Create(parent, id, label, url, pos, size, style, name);
@@ -41,7 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHL_DEFAULT_STYLE, long style = wxHL_DEFAULT_STYLE,
const wxString& name = wxHyperlinkCtrlNameStr); const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
// get/set // get/set

6
include/wx/generic/listctrl.h
View File

@@ -46,7 +46,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLC_ICON, long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr) const wxString &name = wxASCII_STR(wxListCtrlNameStr))
: wxScrollHelper(this) : wxScrollHelper(this)
{ {
Create(parent, winid, pos, size, style, validator, name); Create(parent, winid, pos, size, style, validator, name);
@@ -62,7 +62,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLC_ICON, long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr); const wxString &name = wxASCII_STR(wxListCtrlNameStr));
bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE; bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE;
bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE; bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
@@ -258,7 +258,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLC_ICON, long style = wxLC_ICON,
const wxValidator &validator = wxDefaultValidator, const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxListCtrlNameStr) const wxString &name = wxASCII_STR(wxListCtrlNameStr))
: wxGenericListCtrl(parent, winid, pos, size, style, validator, name) : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
{ {
} }

8
include/wx/generic/mdig.h
View File

@@ -48,7 +48,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -61,7 +61,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual ~wxGenericMDIParentFrame(); virtual ~wxGenericMDIParentFrame();
@@ -142,7 +142,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -155,7 +155,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual ~wxGenericMDIChildFrame(); virtual ~wxGenericMDIChildFrame();

2
include/wx/generic/msgdlgg.h
View File

@@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
public: public:
wxGenericMessageDialog(wxWindow *parent, wxGenericMessageDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxMessageBoxCaptionStr, const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
long style = wxOK|wxCENTRE, long style = wxOK|wxCENTRE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);

4
include/wx/generic/notebook.h
View File

@@ -42,14 +42,14 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxNotebookNameStr); const wxString& name = wxASCII_STR(wxNotebookNameStr));
// Create() function // Create() function
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxNotebookNameStr); const wxString& name = wxASCII_STR(wxNotebookNameStr));
// dtor // dtor
virtual ~wxNotebook(); virtual ~wxNotebook();

4
include/wx/generic/panelg.h
View File

@@ -24,7 +24,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr) const wxString& name = wxASCII_STR(wxPanelNameStr))
{ {
Create(parent, winid, pos, size, style, name); Create(parent, winid, pos, size, style, name);
} }
@@ -34,7 +34,7 @@ public:
wxPanel(wxWindow *parent, wxPanel(wxWindow *parent,
int x, int y, int width, int height, int x, int y, int width, int height,
long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr) const wxString& name = wxASCII_STR(wxPanelNameStr))
{ {
Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
} }

2
include/wx/generic/private/grid.h
View File

@@ -311,7 +311,7 @@ class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
public: public:
wxGridSubwindow(wxGrid *owner, wxGridSubwindow(wxGrid *owner,
int additionalStyle = 0, int additionalStyle = 0,
const wxString& name = wxPanelNameStr) const wxString& name = wxASCII_STR(wxPanelNameStr))
: wxWindow(owner, wxID_ANY, : wxWindow(owner, wxID_ANY,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxBORDER_NONE | additionalStyle, wxBORDER_NONE | additionalStyle,

4
include/wx/generic/propdlg.h
View File

@@ -83,7 +83,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) const wxString& name = wxASCII_STR(wxDialogNameStr))
{ {
Init(); Init();
Create(parent, id, title, pos, sz, style, name); Create(parent, id, title, pos, sz, style, name);
@@ -94,7 +94,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr); const wxString& name = wxASCII_STR(wxDialogNameStr));
//// Accessors //// Accessors

2
include/wx/generic/richmsgdlgg.h
View File

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxGenericRichMessageDialog
public: public:
wxGenericRichMessageDialog(wxWindow *parent, wxGenericRichMessageDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxMessageBoxCaptionStr, const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
long style = wxOK | wxCENTRE) long style = wxOK | wxCENTRE)
: wxRichMessageDialogBase( parent, message, caption, style ), : wxRichMessageDialogBase( parent, message, caption, style ),
m_checkBox(NULL), m_checkBox(NULL),

2
include/wx/generic/spinctlg.h
View File

@@ -424,7 +424,7 @@ private:
void Init() void Init()
{ {
m_digits = 0; m_digits = 0;
m_format = "%0.0f"; m_format = wxASCII_STR("%0.0f");
} }
wxString m_format; wxString m_format;

4
include/wx/generic/srchctlg.h
View File

@@ -34,7 +34,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr); const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
virtual ~wxSearchCtrl(); virtual ~wxSearchCtrl();
@@ -44,7 +44,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr); const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
#if wxUSE_MENUS #if wxUSE_MENUS
// get/set search button menu // get/set search button menu

4
include/wx/generic/statbmpg.h
View File

@@ -22,7 +22,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticBitmapNameStr) const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
{ {
Create(parent, id, bitmap, pos, size, style, name); Create(parent, id, bitmap, pos, size, style, name);
} }
@@ -33,7 +33,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticBitmapNameStr); const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE
{ {

4
include/wx/generic/statline.h
View File

@@ -29,7 +29,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr ) const wxString &name = wxASCII_STR(wxStaticLineNameStr) )
{ {
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
} }
@@ -41,7 +41,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr ); const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
// it's necessary to override this wxWindow function because we // it's necessary to override this wxWindow function because we
// will want to return the main widget for m_statbox // will want to return the main widget for m_statbox

4
include/wx/generic/stattextg.h
View File

@@ -29,7 +29,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticTextNameStr) const wxString& name = wxASCII_STR(wxStaticTextNameStr))
{ {
Init(); Init();
@@ -42,7 +42,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticTextNameStr); const wxString& name = wxASCII_STR(wxStaticTextNameStr));
virtual ~wxGenericStaticText(); virtual ~wxGenericStaticText();

4
include/wx/generic/statusbr.h
View File

@@ -30,7 +30,7 @@ public:
wxStatusBarGeneric(wxWindow *parent, wxStatusBarGeneric(wxWindow *parent,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
const wxString& name = wxStatusBarNameStr) const wxString& name = wxASCII_STR(wxStatusBarNameStr))
{ {
Init(); Init();
@@ -41,7 +41,7 @@ public:
bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY, bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
const wxString& name = wxStatusBarNameStr); const wxString& name = wxASCII_STR(wxStatusBarNameStr));
// implement base class methods // implement base class methods
virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE; virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;

4
include/wx/generic/tabg.h
View File

@@ -276,7 +276,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long windowStyle = wxDEFAULT_DIALOG_STYLE, long windowStyle = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr); const wxString& name = wxASCII_STR(wxDialogNameStr));
virtual ~wxTabbedDialog(); virtual ~wxTabbedDialog();
wxTabView *GetTabView() const { return m_tabView; } wxTabView *GetTabView() const { return m_tabView; }
@@ -307,7 +307,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long windowStyle = 0, long windowStyle = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxASCII_STR(wxPanelNameStr));
virtual ~wxTabbedPanel(); virtual ~wxTabbedPanel();
wxTabView *GetTabView() const { return m_tabView; } wxTabView *GetTabView() const { return m_tabView; }

12
include/wx/generic/textdlgg.h
View File

@@ -44,7 +44,7 @@ public:
wxTextEntryDialog(wxWindow *parent, wxTextEntryDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxGetTextFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
long style = wxTextEntryDialogStyle, long style = wxTextEntryDialogStyle,
const wxPoint& pos = wxDefaultPosition) const wxPoint& pos = wxDefaultPosition)
@@ -54,7 +54,7 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxGetTextFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
long style = wxTextEntryDialogStyle, long style = wxTextEntryDialogStyle,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
@@ -102,7 +102,7 @@ public:
wxPasswordEntryDialog() { } wxPasswordEntryDialog() { }
wxPasswordEntryDialog(wxWindow *parent, wxPasswordEntryDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
long style = wxTextEntryDialogStyle, long style = wxTextEntryDialogStyle,
const wxPoint& pos = wxDefaultPosition) const wxPoint& pos = wxDefaultPosition)
@@ -112,7 +112,7 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
long style = wxTextEntryDialogStyle, long style = wxTextEntryDialogStyle,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
@@ -129,7 +129,7 @@ private:
WXDLLIMPEXP_CORE wxString WXDLLIMPEXP_CORE wxString
wxGetTextFromUser(const wxString& message, wxGetTextFromUser(const wxString& message,
const wxString& caption = wxGetTextFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
const wxString& default_value = wxEmptyString, const wxString& default_value = wxEmptyString,
wxWindow *parent = NULL, wxWindow *parent = NULL,
wxCoord x = wxDefaultCoord, wxCoord x = wxDefaultCoord,
@@ -138,7 +138,7 @@ WXDLLIMPEXP_CORE wxString
WXDLLIMPEXP_CORE wxString WXDLLIMPEXP_CORE wxString
wxGetPasswordFromUser(const wxString& message, wxGetPasswordFromUser(const wxString& message,
const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
const wxString& default_value = wxEmptyString, const wxString& default_value = wxEmptyString,
wxWindow *parent = NULL, wxWindow *parent = NULL,
wxCoord x = wxDefaultCoord, wxCoord x = wxDefaultCoord,

6
include/wx/generic/treectlg.h
View File

@@ -48,7 +48,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_DEFAULT_STYLE, long style = wxTR_DEFAULT_STYLE,
const wxValidator &validator = wxDefaultValidator, const wxValidator &validator = wxDefaultValidator,
const wxString& name = wxTreeCtrlNameStr) const wxString& name = wxASCII_STR(wxTreeCtrlNameStr))
: wxTreeCtrlBase(), : wxTreeCtrlBase(),
wxScrollHelper(this) wxScrollHelper(this)
{ {
@@ -63,7 +63,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_DEFAULT_STYLE, long style = wxTR_DEFAULT_STYLE,
const wxValidator &validator = wxDefaultValidator, const wxValidator &validator = wxDefaultValidator,
const wxString& name = wxTreeCtrlNameStr); const wxString& name = wxASCII_STR(wxTreeCtrlNameStr));
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
@@ -390,7 +390,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_DEFAULT_STYLE, long style = wxTR_DEFAULT_STYLE,
const wxValidator &validator = wxDefaultValidator, const wxValidator &validator = wxDefaultValidator,
const wxString& name = wxTreeCtrlNameStr) const wxString& name = wxASCII_STR(wxTreeCtrlNameStr))
: wxGenericTreeCtrl(parent, id, pos, size, style, validator, name) : wxGenericTreeCtrl(parent, id, pos, size, style, validator, name)
{ {
} }

4
include/wx/gtk/animate.h
View File

@@ -31,7 +31,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAC_DEFAULT_STYLE, long style = wxAC_DEFAULT_STYLE,
const wxString& name = wxAnimationCtrlNameStr) const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
{ {
Init(); Init();
@@ -43,7 +43,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAC_DEFAULT_STYLE, long style = wxAC_DEFAULT_STYLE,
const wxString& name = wxAnimationCtrlNameStr); const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr));
~wxAnimationCtrl(); ~wxAnimationCtrl();

4
include/wx/gtk/bmpbuttn.h
View File

@@ -25,7 +25,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxASCII_STR(wxButtonNameStr))
{ {
Create(parent, id, bitmap, pos, size, style, validator, name); Create(parent, id, bitmap, pos, size, style, validator, name);
} }
@@ -37,7 +37,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxASCII_STR(wxButtonNameStr));
private: private:
wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);

8
include/wx/gtk/bmpcbox.h
View File

@@ -37,7 +37,7 @@ public:
const wxString choices[] = NULL, const wxString choices[] = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr) const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr))
: wxComboBox(), : wxComboBox(),
wxBitmapComboBoxBase() wxBitmapComboBoxBase()
{ {
@@ -55,7 +55,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style, long style,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -66,7 +66,7 @@ public:
const wxString choices[], const wxString choices[],
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -76,7 +76,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr); const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
virtual ~wxBitmapComboBox(); virtual ~wxBitmapComboBox();

4
include/wx/gtk/button.h
View File

@@ -22,7 +22,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxASCII_STR(wxButtonNameStr))
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
@@ -32,7 +32,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxASCII_STR(wxButtonNameStr));
virtual wxWindow *SetDefault() wxOVERRIDE; virtual wxWindow *SetDefault() wxOVERRIDE;
virtual void SetLabel( const wxString &label ) wxOVERRIDE; virtual void SetLabel( const wxString &label ) wxOVERRIDE;

4
include/wx/gtk/calctrl.h
View File

@@ -19,7 +19,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr) const wxString& name = wxASCII_STR(wxCalendarNameStr))
{ {
Create(parent, id, date, pos, size, style, name); Create(parent, id, date, pos, size, style, name);
} }
@@ -30,7 +30,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr); const wxString& name = wxASCII_STR(wxCalendarNameStr));
virtual ~wxGtkCalendarCtrl() {} virtual ~wxGtkCalendarCtrl() {}

4
include/wx/gtk/checkbox.h
View File

@@ -22,7 +22,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr) const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
{ {
Create(parent, id, label, pos, size, style, validator, name); Create(parent, id, label, pos, size, style, validator, name);
} }
@@ -33,7 +33,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr ); const wxString& name = wxASCII_STR(wxCheckBoxNameStr) );
void SetValue( bool state ) wxOVERRIDE; void SetValue( bool state ) wxOVERRIDE;
bool GetValue() const wxOVERRIDE; bool GetValue() const wxOVERRIDE;

4
include/wx/gtk/checklst.h
View File

@@ -25,14 +25,14 @@ public:
const wxString *choices = NULL, const wxString *choices = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxASCII_STR(wxListBoxNameStr));
wxCheckListBox(wxWindow *parent, wxWindowID id, wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxASCII_STR(wxListBoxNameStr));
virtual bool IsChecked(unsigned int index) const wxOVERRIDE; virtual bool IsChecked(unsigned int index) const wxOVERRIDE;
virtual void Check(unsigned int index, bool check = true) wxOVERRIDE; virtual void Check(unsigned int index, bool check = true) wxOVERRIDE;

8
include/wx/gtk/choice.h
View File

@@ -31,7 +31,7 @@ public:
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ) const wxString& name = wxASCII_STR(wxChoiceNameStr) )
{ {
Init(); Init();
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -42,7 +42,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ) const wxString& name = wxASCII_STR(wxChoiceNameStr) )
{ {
Init(); Init();
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
@@ -54,14 +54,14 @@ public:
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ); const wxString& name = wxASCII_STR(wxChoiceNameStr) );
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ); const wxString& name = wxASCII_STR(wxChoiceNameStr) );
int GetSelection() const wxOVERRIDE; int GetSelection() const wxOVERRIDE;
void SetSelection(int n) wxOVERRIDE; void SetSelection(int n) wxOVERRIDE;

4
include/wx/gtk/clrpicker.h
View File

@@ -29,7 +29,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCLRBTN_DEFAULT_STYLE, long style = wxCLRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerWidgetNameStr) const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr))
: m_topParent(NULL) : m_topParent(NULL)
{ {
Create(parent, id, initial, pos, size, style, validator, name); Create(parent, id, initial, pos, size, style, validator, name);
@@ -42,7 +42,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCLRBTN_DEFAULT_STYLE, long style = wxCLRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxColourPickerWidgetNameStr); const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
virtual ~wxColourButton(); virtual ~wxColourButton();

4
include/wx/gtk/collpane.h
View File

@@ -27,7 +27,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCP_DEFAULT_STYLE, long style = wxCP_DEFAULT_STYLE,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr) const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr))
{ {
Init(); Init();
@@ -41,7 +41,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCP_DEFAULT_STYLE, long style = wxCP_DEFAULT_STYLE,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxCollapsiblePaneNameStr); const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr));
virtual void Collapse(bool collapse = true) wxOVERRIDE; virtual void Collapse(bool collapse = true) wxOVERRIDE;
virtual bool IsCollapsed() const wxOVERRIDE; virtual bool IsCollapsed() const wxOVERRIDE;

8
include/wx/gtk/combobox.h
View File

@@ -35,7 +35,7 @@ public:
int n = 0, const wxString choices[] = NULL, int n = 0, const wxString choices[] = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxASCII_STR(wxComboBoxNameStr))
: wxChoice(), wxTextEntry() : wxChoice(), wxTextEntry()
{ {
Init(); Init();
@@ -49,7 +49,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxASCII_STR(wxComboBoxNameStr))
: wxChoice(), wxTextEntry() : wxChoice(), wxTextEntry()
{ {
Init(); Init();
@@ -64,7 +64,7 @@ public:
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxASCII_STR(wxComboBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
@@ -72,7 +72,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxASCII_STR(wxComboBoxNameStr));
// Set/GetSelection() from wxTextEntry and wxChoice // Set/GetSelection() from wxTextEntry and wxChoice

4
include/wx/gtk/control.h
View File

@@ -26,7 +26,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr) const wxString& name = wxASCII_STR(wxControlNameStr))
{ {
Create(parent, id, pos, size, style, validator, name); Create(parent, id, pos, size, style, validator, name);
} }
@@ -35,7 +35,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr); const wxString& name = wxASCII_STR(wxControlNameStr));
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE;
#ifdef __WXGTK3__ #ifdef __WXGTK3__

4
include/wx/gtk/dataview.h
View File

@@ -112,7 +112,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDataViewCtrlNameStr ) const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr) )
{ {
Init(); Init();
@@ -123,7 +123,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxDataViewCtrlNameStr); const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr));
virtual ~wxDataViewCtrl(); virtual ~wxDataViewCtrl();

4
include/wx/gtk/dialog.h
View File

@@ -25,13 +25,13 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ); const wxString &name = wxASCII_STR(wxDialogNameStr) );
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxString &title, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ); const wxString &name = wxASCII_STR(wxDialogNameStr) );
virtual ~wxDialog(); virtual ~wxDialog();
virtual bool Show( bool show = true ) wxOVERRIDE; virtual bool Show( bool show = true ) wxOVERRIDE;

8
include/wx/gtk/dirdlg.h
View File

@@ -19,19 +19,19 @@ public:
wxDirDialog() { } wxDirDialog() { }
wxDirDialog(wxWindow *parent, wxDirDialog(wxWindow *parent,
const wxString& message = wxDirSelectorPromptStr, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxDirDialogNameStr); const wxString& name = wxASCII_STR(wxDirDialogNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& message = wxDirSelectorPromptStr, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
const wxString& defaultPath = wxEmptyString, const wxString& defaultPath = wxEmptyString,
long style = wxDD_DEFAULT_STYLE, long style = wxDD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxDirDialogNameStr); const wxString& name = wxASCII_STR(wxDirDialogNameStr));
virtual ~wxDirDialog() { } virtual ~wxDirDialog() { }

8
include/wx/gtk/filectrl.h
View File

@@ -77,11 +77,11 @@ public:
wxWindowID id, wxWindowID id,
const wxString& defaultDirectory = wxEmptyString, const wxString& defaultDirectory = wxEmptyString,
const wxString& defaultFilename = wxEmptyString, const wxString& defaultFilename = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFC_DEFAULT_STYLE, long style = wxFC_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxFileCtrlNameStr ) const wxString& name = wxASCII_STR(wxFileCtrlNameStr) )
{ {
Init(); Init();
Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
@@ -93,11 +93,11 @@ public:
wxWindowID id, wxWindowID id,
const wxString& defaultDirectory = wxEmptyString, const wxString& defaultDirectory = wxEmptyString,
const wxString& defaultFileName = wxEmptyString, const wxString& defaultFileName = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFC_DEFAULT_STYLE, long style = wxFC_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxFileCtrlNameStr ); const wxString& name = wxASCII_STR(wxFileCtrlNameStr) );
virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE;
virtual void SetFilterIndex( int filterIndex ) wxOVERRIDE; virtual void SetFilterIndex( int filterIndex ) wxOVERRIDE;

12
include/wx/gtk/filedlg.h
View File

@@ -21,23 +21,23 @@ public:
wxFileDialog() { } wxFileDialog() { }
wxFileDialog(wxWindow *parent, wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); const wxString& name = wxASCII_STR(wxFileDialogNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString& defaultDir = wxEmptyString, const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString, const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
long style = wxFD_DEFAULT_STYLE, long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); const wxString& name = wxASCII_STR(wxFileDialogNameStr));
virtual ~wxFileDialog(); virtual ~wxFileDialog();
virtual wxString GetPath() const wxOVERRIDE; virtual wxString GetPath() const wxOVERRIDE;

30
include/wx/gtk/filepicker.h
View File

@@ -56,15 +56,15 @@ public:
wxFileButton() { Init(); } wxFileButton() { Init(); }
wxFileButton(wxWindow *parent, wxFileButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString &path = wxEmptyString, const wxString &path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFILEBTN_DEFAULT_STYLE, long style = wxFILEBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
{ {
Init(); Init();
m_pickerStyle = style; m_pickerStyle = style;
@@ -79,15 +79,15 @@ public: // overrides
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString &path = wxEmptyString, const wxString &path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr); const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
// event handler for the click // event handler for the click
void OnDialogOK(wxCommandEvent &); void OnDialogOK(wxCommandEvent &);
@@ -121,14 +121,14 @@ public:
wxDirButton() { Init(); } wxDirButton() { Init(); }
wxDirButton(wxWindow *parent, wxDirButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString &path = wxEmptyString, const wxString &path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRBTN_DEFAULT_STYLE, long style = wxDIRBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
{ {
Init(); Init();
@@ -145,15 +145,15 @@ public: // overrides
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label = wxFilePickerWidgetLabel, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
const wxString &path = wxEmptyString, const wxString &path = wxEmptyString,
const wxString &message = wxFileSelectorPromptStr, const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
const wxString &wildcard = wxFileSelectorDefaultWildcardStr, const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFilePickerWidgetNameStr); const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
// GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER

4
include/wx/gtk/fontpicker.h
View File

@@ -29,7 +29,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFONTBTN_DEFAULT_STYLE, long style = wxFONTBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerWidgetNameStr) const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr))
{ {
Init(); Init();
@@ -43,7 +43,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFONTBTN_DEFAULT_STYLE, long style = wxFONTBTN_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxFontPickerWidgetNameStr); const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr));
virtual wxColour GetSelectedColour() const wxOVERRIDE virtual wxColour GetSelectedColour() const wxOVERRIDE
{ return m_selectedColour; } { return m_selectedColour; }

4
include/wx/gtk/frame.h
View File

@@ -24,7 +24,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -37,7 +37,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE; void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE;

4
include/wx/gtk/gauge.h
View File

@@ -25,7 +25,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr ) const wxString& name = wxASCII_STR(wxGaugeNameStr) )
{ {
Init(); Init();
@@ -38,7 +38,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL, long style = wxGA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr ); const wxString& name = wxASCII_STR(wxGaugeNameStr) );
// implement base class virtual methods // implement base class virtual methods
void SetRange(int range) wxOVERRIDE; void SetRange(int range) wxOVERRIDE;

4
include/wx/gtk/hyperlink.h
View File

@@ -28,7 +28,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHL_DEFAULT_STYLE, long style = wxHL_DEFAULT_STYLE,
const wxString& name = wxHyperlinkCtrlNameStr); const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
virtual ~wxHyperlinkCtrl(); virtual ~wxHyperlinkCtrl();
@@ -39,7 +39,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHL_DEFAULT_STYLE, long style = wxHL_DEFAULT_STYLE,
const wxString& name = wxHyperlinkCtrlNameStr); const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
// get/set // get/set

8
include/wx/gtk/listbox.h
View File

@@ -30,7 +30,7 @@ public:
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ) const wxString& name = wxASCII_STR(wxListBoxNameStr) )
{ {
Init(); Init();
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -41,7 +41,7 @@ public:
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr ) const wxString& name = wxASCII_STR(wxListBoxNameStr) )
{ {
Init(); Init();
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
@@ -54,14 +54,14 @@ public:
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxASCII_STR(wxListBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxASCII_STR(wxListBoxNameStr));
virtual unsigned int GetCount() const wxOVERRIDE; virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE; virtual wxString GetString(unsigned int n) const wxOVERRIDE;

8
include/wx/gtk/mdi.h
View File

@@ -32,7 +32,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -45,7 +45,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
// we don't store the active child in m_currentChild unlike the base class // we don't store the active child in m_currentChild unlike the base class
// version so override this method to find it dynamically // version so override this method to find it dynamically
@@ -89,7 +89,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Init(); Init();
@@ -102,7 +102,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual ~wxMDIChildFrame(); virtual ~wxMDIChildFrame();

4
include/wx/gtk/minifram.h
View File

@@ -28,7 +28,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAPTION | wxRESIZE_BORDER, long style = wxCAPTION | wxRESIZE_BORDER,
const wxString& name = wxFrameNameStr) const wxString& name = wxASCII_STR(wxFrameNameStr))
{ {
Create(parent, id, title, pos, size, style, name); Create(parent, id, title, pos, size, style, name);
} }
@@ -40,7 +40,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxCAPTION | wxRESIZE_BORDER, long style = wxCAPTION | wxRESIZE_BORDER,
const wxString& name = wxFrameNameStr); const wxString& name = wxASCII_STR(wxFrameNameStr));
virtual void SetTitle( const wxString &title ) wxOVERRIDE; virtual void SetTitle( const wxString &title ) wxOVERRIDE;

2
include/wx/gtk/msgdlg.h
View File

@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
{ {
public: public:
wxMessageDialog(wxWindow *parent, const wxString& message, wxMessageDialog(wxWindow *parent, const wxString& message,
const wxString& caption = wxMessageBoxCaptionStr, const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
long style = wxOK|wxCENTRE, long style = wxOK|wxCENTRE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);

4
include/wx/gtk/notebook.h
View File

@@ -34,14 +34,14 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxNotebookNameStr); const wxString& name = wxASCII_STR(wxNotebookNameStr));
// Create() function // Create() function
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxNotebookNameStr); const wxString& name = wxASCII_STR(wxNotebookNameStr));
// dtor // dtor
virtual ~wxNotebook(); virtual ~wxNotebook();

2
include/wx/gtk/private/addremovectrl.h
View File

@@ -68,7 +68,7 @@ private:
// GTK UI guidelines recommend using "symbolic" versions of the icons // GTK UI guidelines recommend using "symbolic" versions of the icons
// for these buttons, so try them first but fall back to the normal // for these buttons, so try them first but fall back to the normal
// ones if symbolic theme is not installed. // ones if symbolic theme is not installed.
wxBitmap bmp = wxArtProvider::GetBitmap(name + "-symbolic", wxART_MENU); wxBitmap bmp = wxArtProvider::GetBitmap(name + wxASCII_STR("-symbolic"), wxART_MENU);
if ( !bmp.IsOk() ) if ( !bmp.IsOk() )
bmp = wxArtProvider::GetBitmap(name, wxART_MENU); bmp = wxArtProvider::GetBitmap(name, wxART_MENU);
return bmp; return bmp;

8
include/wx/gtk/radiobox.h
View File

@@ -38,7 +38,7 @@ public:
int majorDim = 0, int majorDim = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
{ {
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
} }
@@ -52,7 +52,7 @@ public:
int majorDim = 0, int majorDim = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
{ {
Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
} }
@@ -67,7 +67,7 @@ public:
int majorDim = 0, int majorDim = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
@@ -77,7 +77,7 @@ public:
int majorDim = 0, int majorDim = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
virtual ~wxRadioBox(); virtual ~wxRadioBox();

4
include/wx/gtk/radiobut.h
View File

@@ -24,7 +24,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr ) const wxString& name = wxASCII_STR(wxRadioButtonNameStr) )
{ {
Create( parent, id, label, pos, size, style, validator, name ); Create( parent, id, label, pos, size, style, validator, name );
} }
@@ -36,7 +36,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr ); const wxString& name = wxASCII_STR(wxRadioButtonNameStr) );
virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual void SetValue(bool val); virtual void SetValue(bool val);

4
include/wx/gtk/scrolbar.h
View File

@@ -22,7 +22,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr ) const wxString& name = wxASCII_STR(wxScrollBarNameStr) )
{ {
Create( parent, id, pos, size, style, validator, name ); Create( parent, id, pos, size, style, validator, name );
} }
@@ -31,7 +31,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr ); const wxString& name = wxASCII_STR(wxScrollBarNameStr) );
virtual ~wxScrollBar(); virtual ~wxScrollBar();
int GetThumbPosition() const wxOVERRIDE; int GetThumbPosition() const wxOVERRIDE;
int GetThumbSize() const wxOVERRIDE; int GetThumbSize() const wxOVERRIDE;

4
include/wx/gtk/slider.h
View File

@@ -24,7 +24,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr) const wxString& name = wxASCII_STR(wxSliderNameStr))
{ {
Create( parent, id, value, minValue, maxValue, Create( parent, id, value, minValue, maxValue,
pos, size, style, validator, name ); pos, size, style, validator, name );
@@ -38,7 +38,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr); const wxString& name = wxASCII_STR(wxSliderNameStr));
// implement the base class pure virtuals // implement the base class pure virtuals
virtual int GetValue() const wxOVERRIDE; virtual int GetValue() const wxOVERRIDE;

4
include/wx/gtk/srchctrl.h
View File

@@ -32,7 +32,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr) const wxString& name = wxASCII_STR(wxSearchCtrlNameStr))
: wxSearchCtrlBase() : wxSearchCtrlBase()
{ {
Init(); Init();
@@ -47,7 +47,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr); const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
#if wxUSE_MENUS #if wxUSE_MENUS
// get/set search button menu // get/set search button menu

4
include/wx/gtk/statbmp.h
View File

@@ -25,14 +25,14 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticBitmapNameStr ); const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxStaticBitmapNameStr); const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetBitmap( icon ); } virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetBitmap( icon ); }
virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE; virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;

8
include/wx/gtk/statbox.h
View File

@@ -26,7 +26,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticBoxNameStr ) const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
{ {
Create( parent, id, label, pos, size, style, name ); Create( parent, id, label, pos, size, style, name );
} }
@@ -37,7 +37,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticBoxNameStr ) const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
{ {
Create( parent, id, label, pos, size, style, name ); Create( parent, id, label, pos, size, style, name );
} }
@@ -48,7 +48,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticBoxNameStr ) const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
{ {
return DoCreate( parent, id, &label, NULL, pos, size, style, name ); return DoCreate( parent, id, &label, NULL, pos, size, style, name );
} }
@@ -59,7 +59,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticBoxNameStr ) const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
{ {
return DoCreate( parent, id, NULL, label, pos, size, style, name ); return DoCreate( parent, id, NULL, label, pos, size, style, name );
} }

4
include/wx/gtk/statline.h
View File

@@ -26,13 +26,13 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr); const wxString &name = wxASCII_STR(wxStaticLineNameStr));
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr); const wxString &name = wxASCII_STR(wxStaticLineNameStr));
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

4
include/wx/gtk/stattext.h
View File

@@ -23,7 +23,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -31,7 +31,7 @@ public:
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
void SetLabel( const wxString &label ) wxOVERRIDE; void SetLabel( const wxString &label ) wxOVERRIDE;

4
include/wx/gtk/textctrl.h
View File

@@ -27,7 +27,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxTextCtrlNameStr); const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
virtual ~wxTextCtrl(); virtual ~wxTextCtrl();
@@ -38,7 +38,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxTextCtrlNameStr); const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------

Some files were not shown because too many files have changed in this diff Show More