diff --git a/include/wx/addremovectrl.h b/include/wx/addremovectrl.h
index 94e5630cce..617dfa1ee2 100644
--- a/include/wx/addremovectrl.h
+++ b/include/wx/addremovectrl.h
@@ -66,7 +66,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const wxString& name = wxAddRemoveCtrlNameStr)
+                    const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr))
     {
         Init();
 
@@ -78,7 +78,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxAddRemoveCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr));
 
     virtual ~wxAddRemoveCtrl();
 
diff --git a/include/wx/animate.h b/include/wx/animate.h
index 92051d6490..f024081600 100644
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -171,7 +171,7 @@ protected:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxAC_DEFAULT_STYLE,
-                        const wxString& name = wxAnimationCtrlNameStr)
+                        const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
             : wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name)
             {}
 
diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 81681522ba..b54597659b 100644
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -30,7 +30,7 @@ typedef wxString wxArtID;
 #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_ART_ID_FROM_STR(id)     (id)
-#define wxART_MAKE_ART_ID(id)              (#id)
+#define wxART_MAKE_ART_ID(id)              wxASCII_STR(#id)
 
 // ----------------------------------------------------------------------------
 // Art clients
diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index af0a100ef6..a8ee5d38e6 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -46,7 +46,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                        const wxString& name = wxFrameNameStr);
+                        const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     ~wxAuiMDIParentFrame();
 
@@ -56,7 +56,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr );
+                const wxString& name = wxASCII_STR(wxFrameNameStr) );
 
     void SetArtProvider(wxAuiTabArt* provider);
     wxAuiTabArt* GetArtProvider();
@@ -131,7 +131,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
-                       const wxString& name = wxFrameNameStr);
+                       const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxAuiMDIChildFrame();
     bool Create(wxAuiMDIParentFrame *parent,
@@ -140,7 +140,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
 #if wxUSE_MENUS
     virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE;
diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h
index 00029b24e3..a10f7e1532 100644
--- a/include/wx/bannerwindow.h
+++ b/include/wx/bannerwindow.h
@@ -54,7 +54,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = wxBannerWindowNameStr)
+                   const wxString& name = wxASCII_STR(wxBannerWindowNameStr))
     {
         Init();
 
@@ -68,7 +68,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 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
diff --git a/include/wx/base64.h b/include/wx/base64.h
index 14aaf7d83f..e682757598 100644
--- a/include/wx/base64.h
+++ b/include/wx/base64.h
@@ -42,7 +42,7 @@ inline wxString wxBase64Encode(const void *src, size_t srcLen)
     wxCharBuffer dst(dstLen);
     wxBase64Encode(dst.data(), dstLen, src, srcLen);
 
-    return dst;
+    return wxASCII_STR(dst);
 }
 
 inline wxString wxBase64Encode(const wxMemoryBuffer& buf)
diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index d6d73d4abe..77ae61ab66 100644
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -108,7 +108,7 @@ public:
         const wxColour& col = *wxBLACK, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxColourPickerCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxColourPickerCtrlNameStr))
         { Create(parent, id, col, pos, size, style, validator, name); }
 
     bool Create(wxWindow *parent, wxWindowID id,
@@ -117,7 +117,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxCLRP_DEFAULT_STYLE,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxColourPickerCtrlNameStr);
+           const wxString& name = wxASCII_STR(wxColourPickerCtrlNameStr));
 
 
 public:         // public API
diff --git a/include/wx/collheaderctrl.h b/include/wx/collheaderctrl.h
index 2364218d8e..546b7aa662 100644
--- a/include/wx/collheaderctrl.h
+++ b/include/wx/collheaderctrl.h
@@ -35,7 +35,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxBORDER_NONE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCollapsibleHeaderCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -47,7 +47,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxBORDER_NONE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCollapsibleHeaderCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
     {
         if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
             return false;
@@ -91,7 +91,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxBORDER_NONE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCollapsibleHeaderCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
diff --git a/include/wx/commandlinkbutton.h b/include/wx/commandlinkbutton.h
index bd4b5d2e23..d42322ba42 100644
--- a/include/wx/commandlinkbutton.h
+++ b/include/wx/commandlinkbutton.h
@@ -40,7 +40,7 @@ public:
                             long style = 0,
                             const wxValidator& validator =
                                 wxDefaultValidator,
-                            const wxString& name = wxButtonNameStr)
+                            const wxString& name = wxASCII_STR(wxButtonNameStr))
         : wxButton(parent,
                    id,
                    mainLabel + '\n' + note,
@@ -103,7 +103,7 @@ public:
                                const wxSize& size = wxDefaultSize,
                                long style = 0,
                                const wxValidator& validator = wxDefaultValidator,
-                               const wxString& name = wxButtonNameStr)
+                               const wxString& name = wxASCII_STR(wxButtonNameStr))
         : wxCommandLinkButtonBase()
     {
         Create(parent, id, mainLabel, note, pos, size, style, validator, name);
@@ -117,7 +117,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual void SetMainLabelAndNote(const wxString& mainLabel,
                                      const wxString& note) wxOVERRIDE
@@ -147,7 +147,7 @@ private:
                             const wxSize& size = wxDefaultSize,
                             long style = 0,
                             const wxValidator& validator = wxDefaultValidator,
-                            const wxString& name = wxButtonNameStr)
+                            const wxString& name = wxASCII_STR(wxButtonNameStr))
             : wxGenericCommandLinkButton(parent,
                                          id,
                                          mainLabel,
diff --git a/include/wx/control.h b/include/wx/control.h
index 3500aa5253..21dc74a9c1 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -42,7 +42,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxControlNameStr);
+                const wxString& name = wxASCII_STR(wxControlNameStr));
 
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 417de85ffa..8c5bfbd09a 100644
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -955,7 +955,7 @@ public:
     bool ParseFormat(const wxString& date,
                      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
@@ -1000,7 +1000,7 @@ public:
         // argument corresponds to the preferred date and time representation
         // for the current locale) and returns the string containing the
         // resulting text representation
-    wxString Format(const wxString& format = wxDefaultDateTimeFormat,
+    wxString Format(const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
                     const TimeZone& tz = Local) const;
         // preferred date representation for the current locale
     wxString FormatDate() const { return Format(wxS("%x")); }
@@ -1035,7 +1035,7 @@ public:
     }
 
     wxAnyStrPtr ParseFormat(const wxString& date,
-                            const wxString& format = wxDefaultDateTimeFormat,
+                            const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
                             const wxDateTime& dateDef = wxDefaultDateTime)
     {
         wxString::const_iterator end;
@@ -1084,14 +1084,14 @@ public:
     const wchar_t* ParseRfc822Date(const wchar_t* date);
 
     void ParseFormat(const wxCStrData& date,
-                     const wxString& format = wxDefaultDateTimeFormat,
+                     const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
                      const wxDateTime& dateDef = wxDefaultDateTime)
         { ParseFormat(wxString(date), format, dateDef); }
     const char* ParseFormat(const char* date,
-                            const wxString& format = wxDefaultDateTimeFormat,
+                            const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
                             const wxDateTime& dateDef = wxDefaultDateTime);
     const wchar_t* ParseFormat(const wchar_t* date,
-                               const wxString& format = wxDefaultDateTimeFormat,
+                               const wxString& format = wxASCII_STR(wxDefaultDateTimeFormat),
                                const wxDateTime& dateDef = wxDefaultDateTime);
 
     void ParseDateTime(const wxCStrData& datetime)
@@ -1337,7 +1337,7 @@ public:
         // resulting text representation. Notice that only some of format
         // specifiers valid for wxDateTime are valid for wxTimeSpan: hours,
         // 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
     // ------------------------------------------------------------------------
diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h
index a4e8dcc7bc..c586ab354e 100644
--- a/include/wx/dfb/nonownedwnd.h
+++ b/include/wx/dfb/nonownedwnd.h
@@ -38,7 +38,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = 0,
-                     const wxString& name = wxPanelNameStr)
+                     const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
 
@@ -50,7 +50,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     virtual ~wxNonOwnedWindow();
 
diff --git a/include/wx/dfb/toplevel.h b/include/wx/dfb/toplevel.h
index abf06e449e..c662de77ff 100644
--- a/include/wx/dfb/toplevel.h
+++ b/include/wx/dfb/toplevel.h
@@ -25,7 +25,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -38,7 +38,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = true);
diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index 98800bbb5c..ccd7df176a 100644
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -52,7 +52,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // implement base class (pure) virtual methods
     // -------------------------------------------
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index fba5f4d6e4..01360699f2 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -56,12 +56,12 @@ class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
 public:
     wxDirDialogBase() {}
     wxDirDialogBase(wxWindow *parent,
-                    const wxString& title = wxDirSelectorPromptStr,
+                    const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
                     const wxString& defaultPath = wxEmptyString,
                     long style = wxDD_DEFAULT_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& sz = wxDefaultSize,
-                    const wxString& name = wxDirDialogNameStr)
+                    const wxString& name = wxASCII_STR(wxDirDialogNameStr))
     {
         Create(parent, title, defaultPath, style, pos, sz, name);
     }
@@ -70,12 +70,12 @@ public:
 
 
     bool Create(wxWindow *parent,
-                const wxString& title = wxDirSelectorPromptStr,
+                const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 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))
             return false;
@@ -136,7 +136,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 WXDLLIMPEXP_CORE wxString
-wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+wxDirSelector(const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,
               const wxPoint& pos = wxDefaultPosition,
diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 4ffd2e7509..38093793c3 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -41,7 +41,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
         : wxDocMDIParentFrameBase(manager,
                                   parent, id, title, pos, size, style, name)
     {
@@ -72,7 +72,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
-                       const wxString& name = wxFrameNameStr)
+                       const wxString& name = wxASCII_STR(wxFrameNameStr))
         : wxDocMDIChildFrameBase(doc, view,
                                  parent, id, title, pos, size, style, name)
     {
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 1770170c09..c969da7fe3 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -691,7 +691,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        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);
     }
@@ -704,7 +704,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
+                const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         if ( !wxDocChildFrameAnyBase::Create(doc, view, this) )
             return false;
@@ -767,7 +767,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
+                    const wxString& name = wxASCII_STR(wxFrameNameStr))
         : wxDocChildFrameBase(doc, view,
                               parent, id, title, pos, size, style, name)
     {
@@ -781,7 +781,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
+                const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         return wxDocChildFrameBase::Create
                (
@@ -845,7 +845,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
         : wxDocParentFrameAnyBase(this)
     {
         Create(manager, frame, id, title, pos, size, style, name);
@@ -858,7 +858,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
+                const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         m_docManager = manager;
 
@@ -920,7 +920,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
         : wxDocParentFrameBase(manager,
                                parent, id, title, pos, size, style, name)
     {
@@ -933,7 +933,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
+                const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         return wxDocParentFrameBase::Create(manager,
                                             parent, id, title,
diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 54eaa455e0..85fcea0023 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -300,7 +300,7 @@ class WXDLLIMPEXP_CORE wxDataViewCustomRendererBase
 public:
     // Constructor must specify the usual renderer parameters which we simply
     // pass to the base class
-    wxDataViewCustomRendererBase(const wxString& varianttype = "string",
+    wxDataViewCustomRendererBase(const wxString& varianttype = wxASCII_STR("string"),
                                  wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                                  int align = wxDVR_DEFAULT_ALIGNMENT)
         : wxDataViewCustomRendererRealBase(varianttype, mode, align)
diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h
index 9b78874fa6..5ad53fda05 100644
--- a/include/wx/editlbox.h
+++ b/include/wx/editlbox.h
@@ -41,7 +41,7 @@ public:
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_DEFAULT_STYLE,
-                      const wxString& name = wxEditableListBoxNameStr)
+                      const wxString& name = wxASCII_STR(wxEditableListBoxNameStr))
     {
         Init();
         Create(parent, id, label, pos, size, style, name);
@@ -52,7 +52,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxEL_DEFAULT_STYLE,
-                const wxString& name = wxEditableListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxEditableListBoxNameStr));
 
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings) const;
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index da0cb96c13..8689cc99cd 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -68,14 +68,14 @@ public:
     wxFileDialogBase () { Init(); }
 
     wxFileDialogBase(wxWindow *parent,
-                     const wxString& message = wxFileSelectorPromptStr,
+                     const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                      const wxString& defaultDir = wxEmptyString,
                      const wxString& defaultFile = wxEmptyString,
-                     const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                     const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                      long style = wxFD_DEFAULT_STYLE,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& sz = wxDefaultSize,
-                     const wxString& name = wxFileDialogNameStr)
+                     const wxString& name = wxASCII_STR(wxFileDialogNameStr))
     {
         Init();
         Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name);
@@ -85,14 +85,14 @@ public:
 
 
     bool Create(wxWindow *parent,
-                const wxString& message = wxFileSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                 const wxString& defaultDir = wxEmptyString,
                 const wxString& defaultFile = wxEmptyString,
-                const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                 long style = wxFD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& sz = wxDefaultSize,
-                const wxString& name = wxFileDialogNameStr);
+                const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
     bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
@@ -197,22 +197,22 @@ private:
 
 // File selector - backward compatibility
 WXDLLIMPEXP_CORE wxString
-wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
+wxFileSelector(const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                const wxString& default_path = wxEmptyString,
                const wxString& default_filename = wxEmptyString,
                const wxString& default_extension = wxEmptyString,
-               const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+               const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                int flags = 0,
                wxWindow *parent = NULL,
                int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
 WXDLLIMPEXP_CORE wxString
-wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
+wxFileSelectorEx(const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& default_path = wxEmptyString,
                  const wxString& default_filename = wxEmptyString,
                  int *indexDefaultExtension = NULL,
-                 const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  int flags = 0,
                  wxWindow *parent = NULL,
                  int x = wxDefaultCoord, int y = wxDefaultCoord);
diff --git a/include/wx/filename.h b/include/wx/filename.h
index 6fdd706400..9063b81ad2 100644
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -406,7 +406,7 @@ public:
         //    fn.ReplaceEnvVariable("OPENWINHOME");
         //         // now fn.GetFullPath() == "$OPENWINHOME/lib/someFile"
     bool ReplaceEnvVariable(const wxString& envname,
-                            const wxString& replacementFmtString = "$%s",
+                            const wxString& replacementFmtString = wxS("$%s"),
                             wxPathFormat format = wxPATH_NATIVE);
 
         // 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
     wxString
-    GetHumanReadableSize(const wxString& nullsize = wxGetTranslation("Not available"),
+    GetHumanReadableSize(const wxString& nullsize = wxGetTranslation(wxASCII_STR("Not available")),
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,
-                         const wxString& nullsize = wxGetTranslation("Not available"),
+                         const wxString& nullsize = wxGetTranslation(wxASCII_STR("Not available")),
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG
diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index f573971526..527e5282de 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -235,13 +235,13 @@ public:
     wxFilePickerCtrl(wxWindow *parent,
                      wxWindowID id,
                      const wxString& path = wxEmptyString,
-                     const wxString& message = wxFileSelectorPromptStr,
-                     const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+                     const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
+                     const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFLP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxFilePickerCtrlNameStr)
+                     const wxString& name = wxASCII_STR(wxFilePickerCtrlNameStr))
     {
         Create(parent, id, path, message, wildcard, pos, size, style,
                validator, name);
@@ -250,13 +250,13 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& path = wxEmptyString,
-                const wxString& message = wxFileSelectorPromptStr,
-                const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+                const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
+                const wxString& wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFLP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFilePickerCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxFilePickerCtrlNameStr));
 
     void SetFileName(const wxFileName &filename)
         { SetPath(filename.GetFullPath()); }
@@ -339,24 +339,24 @@ public:
 
     wxDirPickerCtrl(wxWindow *parent, wxWindowID id,
                     const wxString& path = wxEmptyString,
-                    const wxString& message = wxDirSelectorPromptStr,
+                    const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDIRP_DEFAULT_STYLE,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxDirPickerCtrlNameStr)
+                    const wxString& name = wxASCII_STR(wxDirPickerCtrlNameStr))
     {
         Create(parent, id, path, message, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& path = wxEmptyString,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxDirPickerCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxDirPickerCtrlNameStr));
 
     void SetDirName(const wxFileName &dirname)
         { SetPath(dirname.GetPath()); }
diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 323ab8df40..d4bdfd3022 100644
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -117,7 +117,7 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxFontPickerCtrlNameStr)
+                     const wxString& name = wxASCII_STR(wxFontPickerCtrlNameStr))
         : m_nMinPointSize(wxFNTP_MINPOINT_SIZE), m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
     {
         Create(parent, id, initial, pos, size, style, validator, name);
@@ -130,7 +130,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFontPickerCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxFontPickerCtrlNameStr));
 
 
 public:         // public API
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 4c606c34c7..c202f57527 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -66,7 +66,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxDEFAULT_FRAME_STYLE,
-                 const wxString& name = wxFrameNameStr);
+                 const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // frame state
     // -----------
@@ -109,7 +109,7 @@ public:
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxSTB_DEFAULT_STYLE,
                                          wxWindowID winid = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+                                         const wxString& name = wxASCII_STR(wxStatusLineNameStr));
     // return a new status bar
     virtual wxStatusBar *OnCreateStatusBar(int number,
                                            long style,
@@ -139,7 +139,7 @@ public:
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID winid = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr);
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr));
     // return a new toolbar
     virtual wxToolBar *OnCreateToolBar(long style,
                                        wxWindowID winid,
diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h
index 388fbc9c0f..a9a9d8342c 100644
--- a/include/wx/fswatcher.h
+++ b/include/wx/fswatcher.h
@@ -373,7 +373,7 @@ protected:
         wxFileName path_copy = wxFileName(path);
         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()));
             return wxEmptyString;
         }
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index e365d48505..6e642cee0a 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -66,7 +66,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxGA_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
+                const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     // determinate mode API
 
diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h
index 54487b21ee..46413e01dd 100644
--- a/include/wx/generic/animate.h
+++ b/include/wx/generic/animate.h
@@ -28,7 +28,7 @@ public:
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
                            long style = wxAC_DEFAULT_STYLE,
-                           const wxString& name = wxAnimationCtrlNameStr)
+                           const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
     {
         Init();
 
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxAC_DEFAULT_STYLE,
-                const wxString& name = wxAnimationCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr));
 
     ~wxGenericAnimationCtrl();
 
diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index 4630a29a72..90a6ba4351 100644
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -41,7 +41,7 @@ public:
                      const wxString choices[] = NULL,
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr)
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr))
         : wxOwnerDrawnComboBox(),
           wxBitmapComboBoxBase()
     {
@@ -59,7 +59,7 @@ public:
                      const wxArrayString& choices,
                      long style,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr);
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -70,7 +70,7 @@ public:
                 const wxString choices[],
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -80,7 +80,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     virtual ~wxBitmapComboBox();
 
diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h
index 7a96d4adbe..24de813d57 100644
--- a/include/wx/generic/buttonbar.h
+++ b/include/wx/generic/buttonbar.h
@@ -31,7 +31,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxToolBarNameStr)
+              const wxString& name = wxASCII_STR(wxToolBarNameStr))
     {
         Init();
 
@@ -43,7 +43,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxToolBarNameStr );
+                 const wxString& name = wxASCII_STR(wxToolBarNameStr) );
 
     virtual ~wxButtonToolBar();
 
diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 0299b38a3c..50134959e7 100644
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -34,7 +34,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxCAL_SHOW_HOLIDAYS,
-                          const wxString& name = wxCalendarNameStr);
+                          const wxString& name = wxASCII_STR(wxCalendarNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS,
-                const wxString& name = wxCalendarNameStr);
+                const wxString& name = wxASCII_STR(wxCalendarNameStr));
 
     virtual ~wxGenericCalendarCtrl();
 
diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 275c0494a6..9f8327b422 100644
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -33,7 +33,7 @@ public:
                           const wxSize& size = wxDefaultSize,
                           long style = wxCLRBTN_DEFAULT_STYLE,
                           const wxValidator& validator = wxDefaultValidator,
-                          const wxString& name = wxColourPickerWidgetNameStr)
+                          const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr))
     {
         Create(parent, id, col, pos, size, style, validator, name);
     }
@@ -59,7 +59,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLRBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxColourPickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
 
     void OnButtonClick(wxCommandEvent &);
 
diff --git a/include/wx/generic/collheaderctrl.h b/include/wx/generic/collheaderctrl.h
index b2dd3582c2..0fbddf7db9 100644
--- a/include/wx/generic/collheaderctrl.h
+++ b/include/wx/generic/collheaderctrl.h
@@ -23,7 +23,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxBORDER_NONE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCollapsibleHeaderCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr))
     {
         Init();
 
@@ -37,7 +37,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxBORDER_NONE,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCollapsibleHeaderCtrlNameStr);
+        const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr));
 
     virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE;
 
diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 7ea14bb26c..d45bde12bc 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -33,7 +33,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxCP_DEFAULT_STYLE,
                         const wxValidator& val = wxDefaultValidator,
-                        const wxString& name = wxCollapsiblePaneNameStr)
+                        const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr))
     {
         Init();
 
@@ -49,7 +49,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCP_DEFAULT_STYLE,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxCollapsiblePaneNameStr);
+                const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr));
 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true) wxOVERRIDE;
diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 9b0cf9e7b5..3733b3215d 100644
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -48,7 +48,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxValidator& validator = wxDefaultValidator,
-                       const wxString& name = wxComboBoxNameStr)
+                       const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Init();
 
@@ -62,7 +62,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual ~wxGenericComboCtrl();
 
@@ -131,7 +131,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr)
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr))
         : wxGenericComboCtrl()
     {
         (void)Create(parent, id, value, pos, size, style, validator, name);
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 12ee1ce1db..d15991e810 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -202,7 +202,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxDataViewCtrlNameStr )
+           const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr) )
              : wxScrollHelper(this)
     {
         Create(parent, id, pos, size, style, validator, name);
@@ -216,7 +216,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxDataViewCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr));
 
     virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE;
 
diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 8804fb44ac..35bb3063d4 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -83,26 +83,26 @@ class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl
 public:
     wxGenericDirCtrl();
     wxGenericDirCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
-              const wxString &dir = wxDirDialogDefaultFolderStr,
+              const wxString &dir = wxASCII_STR(wxDirDialogDefaultFolderStr),
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxDIRCTRL_DEFAULT_STYLE,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
-              const wxString& name = wxTreeCtrlNameStr )
+              const wxString& name = wxASCII_STR(wxTreeCtrlNameStr) )
     {
         Init();
         Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-              const wxString &dir = wxDirDialogDefaultFolderStr,
+              const wxString &dir = wxASCII_STR(wxDirDialogDefaultFolderStr),
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxDIRCTRL_DEFAULT_STYLE,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
-              const wxString& name = wxTreeCtrlNameStr );
+              const wxString& name = wxASCII_STR(wxTreeCtrlNameStr) );
 
     virtual void Init();
 
diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 85038afe23..5656ef5bd2 100644
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -38,20 +38,20 @@ public:
     wxGenericDirDialog() : wxDirDialogBase() { }
 
     wxGenericDirDialog(wxWindow* parent,
-                       const wxString& title = wxDirSelectorPromptStr,
+                       const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
                        const wxString& defaultPath = wxEmptyString,
                        long style = wxDD_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxDefaultSize,//Size(450, 550),
-                       const wxString& name = wxDirDialogNameStr);
+                       const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
     bool Create(wxWindow* parent,
-                const wxString& title = wxDirSelectorPromptStr,
+                const wxString& title = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& sz = wxDefaultSize,//Size(450, 550),
-                       const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
     //// Accessors
     void SetPath(const wxString& path) wxOVERRIDE;
diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h
index c7bb9ddf4a..76ca57eb73 100644
--- a/include/wx/generic/filectrlg.h
+++ b/include/wx/generic/filectrlg.h
@@ -195,11 +195,11 @@ public:
                         wxWindowID id,
                         const wxString& defaultDirectory = wxEmptyString,
                         const wxString& defaultFilename = wxEmptyString,
-                        const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                        const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                         long style = wxFC_DEFAULT_STYLE,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
-                        const wxString& name = wxFileCtrlNameStr )
+                        const wxString& name = wxASCII_STR(wxFileCtrlNameStr) )
     {
         m_ignoreChanges = false;
         Create(parent, id, defaultDirectory, defaultFilename, wildCard,
@@ -212,11 +212,11 @@ public:
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,
                  const wxString& defaultFileName = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFC_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 const wxString& name = wxFileCtrlNameStr );
+                 const wxString& name = wxASCII_STR(wxFileCtrlNameStr) );
 
     virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE;
     virtual void SetFilterIndex( int filterindex ) wxOVERRIDE;
diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 29ea5d4d36..9ec1b51c56 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -37,25 +37,25 @@ public:
     wxGenericFileDialog() : wxFileDialogBase() { Init(); }
 
     wxGenericFileDialog(wxWindow *parent,
-                        const wxString& message = wxFileSelectorPromptStr,
+                        const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
-                        const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                        const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                         long style = wxFD_DEFAULT_STYLE,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& sz = wxDefaultSize,
-                        const wxString& name = wxFileDialogNameStr,
+                        const wxString& name = wxASCII_STR(wxFileDialogNameStr),
                         bool bypassGenericImpl = false );
 
     bool Create( wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr,
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr),
                  bool bypassGenericImpl = false );
 
     virtual ~wxGenericFileDialog();
@@ -143,10 +143,10 @@ public:
     wxFileDialog() {}
 
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index cf4782f8d7..762dc4fb7a 100644
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -31,15 +31,15 @@ public:
     wxGenericFileDirButton() { Init(); }
     wxGenericFileDirButton(wxWindow *parent,
                            wxWindowID id,
-                           const wxString& label = wxFilePickerWidgetLabel,
+                           const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                            const wxString& path = wxEmptyString,
-                           const wxString &message = wxFileSelectorPromptStr,
-                           const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+                           const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+                           const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
                            long style = 0,
                            const wxValidator& validator = wxDefaultValidator,
-                           const wxString& name = wxFilePickerWidgetNameStr)
+                           const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
     {
         Init();
         Create(parent, id, label, path, message, wildcard,
@@ -62,15 +62,15 @@ public:     // overridable
 public:
 
     bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label = wxFilePickerWidgetLabel,
+           const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
            const wxString& path = wxEmptyString,
-           const wxString &message = wxFileSelectorPromptStr,
-           const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+           const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+           const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxFilePickerWidgetNameStr);
+           const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
 
     // event handler for the click
     void OnButtonClick(wxCommandEvent &);
@@ -104,15 +104,15 @@ public:
     wxGenericFileButton() {}
     wxGenericFileButton(wxWindow *parent,
                         wxWindowID id,
-                        const wxString& label = wxFilePickerWidgetLabel,
+                        const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                         const wxString& path = wxEmptyString,
-                        const wxString &message = wxFileSelectorPromptStr,
-                        const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+                        const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+                        const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxFILEBTN_DEFAULT_STYLE,
                         const wxValidator& validator = wxDefaultValidator,
-                        const wxString& name = wxFilePickerWidgetNameStr)
+                        const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
     {
         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
@@ -172,14 +172,14 @@ public:
     wxGenericDirButton() {}
     wxGenericDirButton(wxWindow *parent,
                        wxWindowID id,
-                       const wxString& label = wxDirPickerWidgetLabel,
+                       const wxString& label = wxASCII_STR(wxDirPickerWidgetLabel),
                        const wxString& path = wxEmptyString,
-                       const wxString &message = wxDirSelectorPromptStr,
+                       const wxString &message = wxASCII_STR(wxDirSelectorPromptStr),
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDIRBTN_DEFAULT_STYLE,
                        const wxValidator& validator = wxDefaultValidator,
-                       const wxString& name = wxDirPickerWidgetNameStr)
+                       const wxString& name = wxASCII_STR(wxDirPickerWidgetNameStr))
     {
         Create(parent, id, label, path, message, wxEmptyString,
                pos, size, style, validator, name);
diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index 04662c64d5..2273d1d3bf 100644
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -30,7 +30,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxFONTBTN_DEFAULT_STYLE,
                         const wxValidator& validator = wxDefaultValidator,
-                        const wxString& name = wxFontPickerWidgetNameStr)
+                        const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr))
     {
         Create(parent, id, initial, pos, size, style, validator, name);
     }
@@ -62,7 +62,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxFONTBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFontPickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr));
 
     void OnButtonClick(wxCommandEvent &);
 
diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 5f081ab92b..935180d8cf 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1480,7 +1480,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
-            const wxString& name = wxGridNameStr)
+            const wxString& name = wxASCII_STR(wxGridNameStr))
     {
         Init();
 
@@ -1492,7 +1492,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxWANTS_CHARS,
-                const wxString& name = wxGridNameStr);
+                const wxString& name = wxASCII_STR(wxGridNameStr));
 
     virtual ~wxGrid();
 
@@ -2354,7 +2354,7 @@ public:
     wxGrid( wxWindow *parent,
             int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,
             long style = wxWANTS_CHARS,
-            const wxString& name = wxPanelNameStr )
+            const wxString& name = wxASCII_STR(wxPanelNameStr) )
     {
         Init();
         Create(parent, wxID_ANY, wxPoint(x, y), wxSize(w, h), style, name);
diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 167201132c..d55edddfd3 100644
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -217,8 +217,8 @@ protected:
 class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellDateRenderer
 {
 public:
-    wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat,
-                               const wxString& informat = wxDefaultDateTimeFormat);
+    wxGridCellDateTimeRenderer(const wxString& outformat = wxASCII_STR(wxDefaultDateTimeFormat),
+                               const wxString& informat = wxASCII_STR(wxDefaultDateTimeFormat));
 
     wxGridCellDateTimeRenderer(const wxGridCellDateTimeRenderer& other)
         : wxGridCellDateRenderer(other),
diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h
index 249917adf2..77da772496 100644
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -31,7 +31,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHD_DEFAULT_STYLE,
-                 const wxString& name = wxHeaderCtrlNameStr)
+                 const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr))
     {
         Init();
 
@@ -43,7 +43,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHD_DEFAULT_STYLE,
-                const wxString& name = wxHeaderCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr));
 
     virtual ~wxHeaderCtrl();
 
diff --git a/include/wx/generic/hyperlink.h b/include/wx/generic/hyperlink.h
index df452db301..0c238e1029 100644
--- a/include/wx/generic/hyperlink.h
+++ b/include/wx/generic/hyperlink.h
@@ -28,7 +28,7 @@ public:
                             const wxPoint& pos = wxDefaultPosition,
                             const wxSize& size = wxDefaultSize,
                             long style = wxHL_DEFAULT_STYLE,
-                            const wxString& name = wxHyperlinkCtrlNameStr)
+                            const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr))
     {
         Init();
         (void) Create(parent, id, label, url, pos, size, style, name);
@@ -41,7 +41,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHL_DEFAULT_STYLE,
-                const wxString& name = wxHyperlinkCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
 
 
     // get/set
diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index f1ab86bb64..60e034f1af 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -46,7 +46,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxListCtrlNameStr)
+                const wxString &name = wxASCII_STR(wxListCtrlNameStr))
             : wxScrollHelper(this)
     {
         Create(parent, winid, pos, size, style, validator, name);
@@ -62,7 +62,7 @@ public:
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString &name = wxListCtrlNameStr);
+                 const wxString &name = wxASCII_STR(wxListCtrlNameStr));
 
     bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE;
     bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
@@ -258,7 +258,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator &validator = wxDefaultValidator,
-               const wxString &name = wxListCtrlNameStr)
+               const wxString &name = wxASCII_STR(wxListCtrlNameStr))
     : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
     {
     }
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 7bc835d281..cb3a12db90 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -48,7 +48,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -61,7 +61,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxGenericMDIParentFrame();
 
@@ -142,7 +142,7 @@ public:
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
                            long style = wxDEFAULT_FRAME_STYLE,
-                           const wxString& name = wxFrameNameStr)
+                           const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -155,7 +155,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxGenericMDIChildFrame();
 
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index a5c3c115bd..e85744a3f6 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
 public:
     wxGenericMessageDialog(wxWindow *parent,
                            const wxString& message,
-                           const wxString& caption = wxMessageBoxCaptionStr,
+                           const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                            long style = wxOK|wxCENTRE,
                            const wxPoint& pos = wxDefaultPosition);
 
diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 807baebe2e..40ff917c0d 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -42,14 +42,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr);
+             const wxString& name = wxASCII_STR(wxNotebookNameStr));
     // Create() function
   bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
     // dtor
   virtual ~wxNotebook();
 
diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 5c02cb35d8..61124e0397 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -24,7 +24,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
+            const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Create(parent, winid, pos, size, style, name);
     }
@@ -34,7 +34,7 @@ public:
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
             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);
     }
diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index acf0b68207..1330bb1044 100644
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -311,7 +311,7 @@ class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
 public:
     wxGridSubwindow(wxGrid *owner,
                     int additionalStyle = 0,
-                    const wxString& name = wxPanelNameStr)
+                    const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxWindow(owner, wxID_ANY,
                    wxDefaultPosition, wxDefaultSize,
                    wxBORDER_NONE | additionalStyle,
diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index eacc73e1b6..4dc1befce9 100644
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -83,7 +83,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxDefaultSize,
                        long style = wxDEFAULT_DIALOG_STYLE,
-                       const wxString& name = wxDialogNameStr)
+                       const wxString& name = wxASCII_STR(wxDialogNameStr))
     {
         Init();
         Create(parent, id, title, pos, sz, style, name);
@@ -94,7 +94,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxDefaultSize,
                        long style = wxDEFAULT_DIALOG_STYLE,
-                       const wxString& name = wxDialogNameStr);
+                       const wxString& name = wxASCII_STR(wxDialogNameStr));
 
 //// Accessors
 
diff --git a/include/wx/generic/richmsgdlgg.h b/include/wx/generic/richmsgdlgg.h
index ae955d0af0..bf1d9d5721 100644
--- a/include/wx/generic/richmsgdlgg.h
+++ b/include/wx/generic/richmsgdlgg.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxGenericRichMessageDialog
 public:
     wxGenericRichMessageDialog(wxWindow *parent,
                                const wxString& message,
-                               const wxString& caption = wxMessageBoxCaptionStr,
+                               const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                                long style = wxOK | wxCENTRE)
         : wxRichMessageDialogBase( parent, message, caption, style ),
           m_checkBox(NULL),
diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 252d278dc1..bcb589ef15 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -424,7 +424,7 @@ private:
     void Init()
     {
         m_digits = 0;
-        m_format = "%0.0f";
+        m_format = wxASCII_STR("%0.0f");
     }
 
     wxString m_format;
diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index a123fcfab3..47acfb1242 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -34,7 +34,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxSearchCtrlNameStr);
+               const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
 
     virtual ~wxSearchCtrl();
 
@@ -44,7 +44,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSearchCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
 
 #if wxUSE_MENUS
     // get/set search button menu
diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h
index e915473420..abf7340878 100644
--- a/include/wx/generic/statbmpg.h
+++ b/include/wx/generic/statbmpg.h
@@ -22,7 +22,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = 0,
-                          const wxString& name = wxStaticBitmapNameStr)
+                          const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
     {
             Create(parent, id, bitmap, pos, size, style, name);
     }
@@ -33,7 +33,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE
     {
diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 5cd06f3714..39dfa09300 100644
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -29,7 +29,7 @@ public:
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticLineNameStr )
+                  const wxString &name = wxASCII_STR(wxStaticLineNameStr) )
     {
         Create(parent, id, pos, size, style, name);
     }
@@ -41,7 +41,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
     // it's necessary to override this wxWindow function because we
     // will want to return the main widget for m_statbox
diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 84210423d4..6b98f6c064 100644
--- a/include/wx/generic/stattextg.h
+++ b/include/wx/generic/stattextg.h
@@ -29,7 +29,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxStaticTextNameStr)
+                 const wxString& name = wxASCII_STR(wxStaticTextNameStr))
     {
         Init();
 
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticTextNameStr);
+                const wxString& name = wxASCII_STR(wxStaticTextNameStr));
 
     virtual ~wxGenericStaticText();
 
diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 996012b07a..8a3d73d4f7 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -30,7 +30,7 @@ public:
     wxStatusBarGeneric(wxWindow *parent,
                        wxWindowID winid = wxID_ANY,
                        long style = wxSTB_DEFAULT_STYLE,
-                       const wxString& name = wxStatusBarNameStr)
+                       const wxString& name = wxASCII_STR(wxStatusBarNameStr))
     {
         Init();
 
@@ -41,7 +41,7 @@ public:
 
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr);
+                const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     // implement base class methods
     virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;
diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index c9c4fe6021..f67870defd 100644
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -276,7 +276,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long windowStyle = wxDEFAULT_DIALOG_STYLE,
-                   const wxString& name = wxDialogNameStr);
+                   const wxString& name = wxASCII_STR(wxDialogNameStr));
     virtual ~wxTabbedDialog();
 
     wxTabView *GetTabView() const { return m_tabView; }
@@ -307,7 +307,7 @@ public:
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long windowStyle = 0,
-                  const wxString& name = wxPanelNameStr);
+                  const wxString& name = wxASCII_STR(wxPanelNameStr));
     virtual ~wxTabbedPanel();
 
     wxTabView *GetTabView() const { return m_tabView; }
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 9aee847083..7d9d61ea98 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -44,7 +44,7 @@ public:
 
     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
-                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
                       const wxString& value = wxEmptyString,
                       long style = wxTextEntryDialogStyle,
                       const wxPoint& pos = wxDefaultPosition)
@@ -54,7 +54,7 @@ public:
 
     bool Create(wxWindow *parent,
                 const wxString& message,
-                const wxString& caption = wxGetTextFromUserPromptStr,
+                const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
                 const wxString& value = wxEmptyString,
                 long style = wxTextEntryDialogStyle,
                 const wxPoint& pos = wxDefaultPosition);
@@ -102,7 +102,7 @@ public:
     wxPasswordEntryDialog() { }
     wxPasswordEntryDialog(wxWindow *parent,
                       const wxString& message,
-                      const wxString& caption = wxGetPasswordFromUserPromptStr,
+                      const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
                       const wxString& value = wxEmptyString,
                       long style = wxTextEntryDialogStyle,
                       const wxPoint& pos = wxDefaultPosition)
@@ -112,7 +112,7 @@ public:
 
     bool Create(wxWindow *parent,
                 const wxString& message,
-                const wxString& caption = wxGetPasswordFromUserPromptStr,
+                const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
                 const wxString& value = wxEmptyString,
                 long style = wxTextEntryDialogStyle,
                 const wxPoint& pos = wxDefaultPosition);
@@ -129,7 +129,7 @@ private:
 
 WXDLLIMPEXP_CORE wxString
     wxGetTextFromUser(const wxString& message,
-                    const wxString& caption = wxGetTextFromUserPromptStr,
+                    const wxString& caption = wxASCII_STR(wxGetTextFromUserPromptStr),
                     const wxString& default_value = wxEmptyString,
                     wxWindow *parent = NULL,
                     wxCoord x = wxDefaultCoord,
@@ -138,7 +138,7 @@ WXDLLIMPEXP_CORE wxString
 
 WXDLLIMPEXP_CORE wxString
     wxGetPasswordFromUser(const wxString& message,
-                        const wxString& caption = wxGetPasswordFromUserPromptStr,
+                        const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr),
                         const wxString& default_value = wxEmptyString,
                         wxWindow *parent = NULL,
                         wxCoord x = wxDefaultCoord,
diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 2388eedc9c..fb492d6a7c 100644
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -48,7 +48,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_DEFAULT_STYLE,
                const wxValidator &validator = wxDefaultValidator,
-               const wxString& name = wxTreeCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTreeCtrlNameStr))
         : wxTreeCtrlBase(),
           wxScrollHelper(this)
     {
@@ -63,7 +63,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_DEFAULT_STYLE,
                 const wxValidator &validator = wxDefaultValidator,
-                const wxString& name = wxTreeCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTreeCtrlNameStr));
 
     // implement base class pure virtuals
     // ----------------------------------
@@ -390,7 +390,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_DEFAULT_STYLE,
                const wxValidator &validator = wxDefaultValidator,
-               const wxString& name = wxTreeCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTreeCtrlNameStr))
     : wxGenericTreeCtrl(parent, id, pos, size, style, validator, name)
     {
     }
diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 6b8ab3ac9b..c1fc33155e 100644
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -31,7 +31,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxAC_DEFAULT_STYLE,
-                        const wxString& name = wxAnimationCtrlNameStr)
+                        const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
     {
         Init();
 
@@ -43,7 +43,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxAC_DEFAULT_STYLE,
-                const wxString& name = wxAnimationCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr));
 
     ~wxAnimationCtrl();
 
diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 70b4d4326d..1748c5e5e1 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -25,7 +25,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
+                   const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
@@ -37,7 +37,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index 57b464aa81..7b19fb31ce 100644
--- a/include/wx/gtk/bmpcbox.h
+++ b/include/wx/gtk/bmpcbox.h
@@ -37,7 +37,7 @@ public:
                      const wxString choices[] = NULL,
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr)
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr))
         : wxComboBox(),
           wxBitmapComboBoxBase()
     {
@@ -55,7 +55,7 @@ public:
                      const wxArrayString& choices,
                      long style,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr);
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -66,7 +66,7 @@ public:
                 const wxString choices[],
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -76,7 +76,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     virtual ~wxBitmapComboBox();
 
diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 47e43b011e..b8e8128d71 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -22,7 +22,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
+           const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -32,7 +32,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
+           const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual wxWindow *SetDefault() wxOVERRIDE;
     virtual void SetLabel( const wxString &label ) wxOVERRIDE;
diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h
index 81be1cd638..5682cee257 100644
--- a/include/wx/gtk/calctrl.h
+++ b/include/wx/gtk/calctrl.h
@@ -19,7 +19,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxCAL_SHOW_HOLIDAYS,
-                          const wxString& name = wxCalendarNameStr)
+                          const wxString& name = wxASCII_STR(wxCalendarNameStr))
     {
         Create(parent, id, date, pos, size, style, name);
     }
@@ -30,7 +30,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS,
-                const wxString& name = wxCalendarNameStr);
+                const wxString& name = wxASCII_STR(wxCalendarNameStr));
 
     virtual ~wxGtkCalendarCtrl() {}
 
diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index e16bc4f3ff..e20b834c8a 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -22,7 +22,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -33,7 +33,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr );
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr) );
 
     void SetValue( bool state ) wxOVERRIDE;
     bool GetValue() const wxOVERRIDE;
diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index a12eb180da..6f9a2645f7 100644
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -25,14 +25,14 @@ public:
             const wxString *choices = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
     wxCheckListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
             const wxSize& size,
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual bool IsChecked(unsigned int index) const wxOVERRIDE;
     virtual void Check(unsigned int index, bool check = true) wxOVERRIDE;
diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index c594624812..ed8a514877 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -31,7 +31,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr )
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) )
     {
         Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -42,7 +42,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr )
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) )
     {
         Init();
         Create(parent, id, pos, size, choices, style, validator, name);
@@ -54,14 +54,14 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
             const wxSize& size,
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     int GetSelection() const wxOVERRIDE;
     void SetSelection(int n) wxOVERRIDE;
diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index b9894b5309..395fb9ffdc 100644
--- a/include/wx/gtk/clrpicker.h
+++ b/include/wx/gtk/clrpicker.h
@@ -29,7 +29,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = wxCLRBTN_DEFAULT_STYLE,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxColourPickerWidgetNameStr)
+                   const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr))
         : m_topParent(NULL)
     {
         Create(parent, id, initial, pos, size, style, validator, name);
@@ -42,7 +42,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLRBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxColourPickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
 
     virtual ~wxColourButton();
 
diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index 3942e5b4c8..053b9b5573 100644
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -27,7 +27,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxCP_DEFAULT_STYLE,
                         const wxValidator& val = wxDefaultValidator,
-                        const wxString& name = wxCollapsiblePaneNameStr)
+                        const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr))
     {
         Init();
 
@@ -41,7 +41,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCP_DEFAULT_STYLE,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxCollapsiblePaneNameStr);
+                const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr));
 
     virtual void Collapse(bool collapse = true) wxOVERRIDE;
     virtual bool IsCollapsed() const wxOVERRIDE;
diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 1daf836a4a..982caa183b 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -35,7 +35,7 @@ public:
                int n = 0, const wxString choices[] = NULL,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr)
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr))
         : wxChoice(), wxTextEntry()
     {
         Init();
@@ -49,7 +49,7 @@ public:
                const wxArrayString& choices,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr)
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr))
         : wxChoice(), wxTextEntry()
     {
         Init();
@@ -64,7 +64,7 @@ public:
                 int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value,
                 const wxPoint& pos,
@@ -72,7 +72,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     // Set/GetSelection() from wxTextEntry and wxChoice
 
diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 2890f6ccaa..fcfe03d169 100644
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -26,7 +26,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr)
+             const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -35,7 +35,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
     virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE;
 #ifdef __WXGTK3__
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 6c51aab27a..ae2d2f0165 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -112,7 +112,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxDataViewCtrlNameStr )
+           const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr) )
     {
         Init();
 
@@ -123,7 +123,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxDataViewCtrlNameStr);
+           const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr));
 
     virtual ~wxDataViewCtrl();
 
diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index b64a0dc510..29f2fb5fd7 100644
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -25,13 +25,13 @@ public:
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
     bool Create( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
     virtual ~wxDialog();
 
     virtual bool Show( bool show = true ) wxOVERRIDE;
diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index e8029a21c7..e25e0b293d 100644
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -19,19 +19,19 @@ public:
     wxDirDialog() { }
 
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
     bool Create(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
     virtual ~wxDirDialog() { }
 
 
diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index b2fad39cb6..870c5753cc 100644
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -77,11 +77,11 @@ public:
                     wxWindowID id,
                     const wxString& defaultDirectory = wxEmptyString,
                     const wxString& defaultFilename = wxEmptyString,
-                    const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                    const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                     long style = wxFC_DEFAULT_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
-                    const wxString& name = wxFileCtrlNameStr )
+                    const wxString& name = wxASCII_STR(wxFileCtrlNameStr) )
     {
         Init();
         Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
@@ -93,11 +93,11 @@ public:
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,
                  const wxString& defaultFileName = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFC_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 const wxString& name = wxFileCtrlNameStr );
+                 const wxString& name = wxASCII_STR(wxFileCtrlNameStr) );
 
     virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE;
     virtual void SetFilterIndex( int filterIndex ) wxOVERRIDE;
diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 5db235f5c4..9e3644493b 100644
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -21,23 +21,23 @@ public:
     wxFileDialog() { }
 
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
     bool Create(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
     virtual ~wxFileDialog();
 
     virtual wxString GetPath() const wxOVERRIDE;
diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index e6948e7105..b2ab35c2a8 100644
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -56,15 +56,15 @@ public:
     wxFileButton() { Init(); }
     wxFileButton(wxWindow *parent,
                  wxWindowID id,
-                 const wxString& label = wxFilePickerWidgetLabel,
+                 const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                  const wxString &path = wxEmptyString,
-                 const wxString &message = wxFileSelectorPromptStr,
-                 const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+                 const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+                 const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxFILEBTN_DEFAULT_STYLE,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxFilePickerWidgetNameStr)
+                 const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
     {
         Init();
         m_pickerStyle = style;
@@ -79,15 +79,15 @@ public:     // overrides
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxString& label = wxFilePickerWidgetLabel,
+                const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                 const wxString &path = wxEmptyString,
-                const wxString &message = wxFileSelectorPromptStr,
-                const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+                const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+                const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFilePickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
 
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
@@ -121,14 +121,14 @@ public:
     wxDirButton() { Init(); }
     wxDirButton(wxWindow *parent,
                 wxWindowID id,
-                const wxString& label = wxFilePickerWidgetLabel,
+                const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                 const wxString &path = wxEmptyString,
-                const wxString &message = wxFileSelectorPromptStr,
+                const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFilePickerWidgetNameStr)
+                const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr))
     {
         Init();
 
@@ -145,15 +145,15 @@ public:     // overrides
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxString& label = wxFilePickerWidgetLabel,
+                const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel),
                 const wxString &path = wxEmptyString,
-                const wxString &message = wxFileSelectorPromptStr,
-                const wxString &wildcard = wxFileSelectorDefaultWildcardStr,
+                const wxString &message = wxASCII_STR(wxFileSelectorPromptStr),
+                const wxString &wildcard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFilePickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxFilePickerWidgetNameStr));
 
 
     // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER
diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index ce56da14d0..46d1304f71 100644
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -29,7 +29,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxFONTBTN_DEFAULT_STYLE,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxFontPickerWidgetNameStr)
+                 const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr))
     {
         Init();
 
@@ -43,7 +43,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxFONTBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFontPickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxFontPickerWidgetNameStr));
 
     virtual wxColour GetSelectedColour() const wxOVERRIDE
         { return m_selectedColour; }
diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 878ba99732..dce878b590 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -24,7 +24,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxDEFAULT_FRAME_STYLE,
-               const wxString& name = wxFrameNameStr)
+               const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -37,7 +37,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
 #if wxUSE_STATUSBAR
     void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE;
diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 7e138e7ed2..cad2bc6934 100644
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -25,7 +25,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxGA_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxGaugeNameStr )
+             const wxString& name = wxASCII_STR(wxGaugeNameStr) )
     {
         Init();
 
@@ -38,7 +38,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxGA_HORIZONTAL,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxGaugeNameStr );
+                 const wxString& name = wxASCII_STR(wxGaugeNameStr) );
 
     // implement base class virtual methods
     void SetRange(int range) wxOVERRIDE;
diff --git a/include/wx/gtk/hyperlink.h b/include/wx/gtk/hyperlink.h
index d7748ce159..b8776e15b2 100644
--- a/include/wx/gtk/hyperlink.h
+++ b/include/wx/gtk/hyperlink.h
@@ -28,7 +28,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxHL_DEFAULT_STYLE,
-                    const wxString& name = wxHyperlinkCtrlNameStr);
+                    const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
 
     virtual ~wxHyperlinkCtrl();
 
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHL_DEFAULT_STYLE,
-                const wxString& name = wxHyperlinkCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
 
 
     // get/set
diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index de55c6a418..e597bd283e 100644
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -30,7 +30,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr )
+            const wxString& name = wxASCII_STR(wxListBoxNameStr) )
     {
         Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -41,7 +41,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr )
+            const wxString& name = wxASCII_STR(wxListBoxNameStr) )
     {
         Init();
         Create(parent, id, pos, size, choices, style, validator, name);
@@ -54,14 +54,14 @@ public:
                 int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual unsigned int GetCount() const wxOVERRIDE;
     virtual wxString GetString(unsigned int n) const wxOVERRIDE;
diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index bf34285176..69f372cf62 100644
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -32,7 +32,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -45,7 +45,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 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
     // version so override this method to find it dynamically
@@ -89,7 +89,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
+                    const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -102,7 +102,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxMDIChildFrame();
 
diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 14803ef375..318af566a1 100644
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -28,7 +28,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxCAPTION | wxRESIZE_BORDER,
-            const wxString& name = wxFrameNameStr)
+            const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Create(parent, id, title, pos, size, style, name);
     }
@@ -40,7 +40,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxCAPTION | wxRESIZE_BORDER,
-            const wxString& name = wxFrameNameStr);
+            const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual void SetTitle( const wxString &title ) wxOVERRIDE;
 
diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index 5a55f32a50..e0ad8cca45 100644
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
+                    const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 395927cc69..65cecbce8f 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -34,14 +34,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr);
+             const wxString& name = wxASCII_STR(wxNotebookNameStr));
       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
       // dtor
     virtual ~wxNotebook();
 
diff --git a/include/wx/gtk/private/addremovectrl.h b/include/wx/gtk/private/addremovectrl.h
index a790c6e674..c9771a134d 100644
--- a/include/wx/gtk/private/addremovectrl.h
+++ b/include/wx/gtk/private/addremovectrl.h
@@ -68,7 +68,7 @@ private:
         // GTK UI guidelines recommend using "symbolic" versions of the icons
         // for these buttons, so try them first but fall back to the normal
         // 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() )
             bmp = wxArtProvider::GetBitmap(name, wxART_MENU);
         return bmp;
diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index f38f82a599..e915770079 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -38,7 +38,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                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 );
     }
@@ -52,7 +52,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                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 );
     }
@@ -67,7 +67,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -77,7 +77,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     virtual ~wxRadioBox();
 
diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 7ef6a6a162..cf6492a623 100644
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -24,7 +24,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxRadioButtonNameStr )
+                   const wxString& name = wxASCII_STR(wxRadioButtonNameStr) )
     {
         Create( parent, id, label, pos, size, style, validator, name );
     }
@@ -36,7 +36,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxRadioButtonNameStr );
+                 const wxString& name = wxASCII_STR(wxRadioButtonNameStr) );
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
     virtual void SetValue(bool val);
diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index ceac3fd209..442a153b0d 100644
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -22,7 +22,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr )
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) )
     {
         Create( parent, id, pos, size, style, validator, name );
     }
@@ -31,7 +31,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr );
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) );
     virtual ~wxScrollBar();
     int GetThumbPosition() const wxOVERRIDE;
     int GetThumbSize() const wxOVERRIDE;
diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 94132f9833..0a34fcf729 100644
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -24,7 +24,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr)
+             const wxString& name = wxASCII_STR(wxSliderNameStr))
     {
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
@@ -38,7 +38,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     // implement the base class pure virtuals
     virtual int GetValue() const wxOVERRIDE;
diff --git a/include/wx/gtk/srchctrl.h b/include/wx/gtk/srchctrl.h
index d106896769..f4531c3571 100644
--- a/include/wx/gtk/srchctrl.h
+++ b/include/wx/gtk/srchctrl.h
@@ -32,7 +32,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxSearchCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxSearchCtrlNameStr))
         : wxSearchCtrlBase()
     {
         Init();
@@ -47,7 +47,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSearchCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
 
 #if wxUSE_MENUS
     // get/set search button menu
diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index e79255ee3a..28b116134c 100644
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -25,14 +25,14 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const wxString& name = wxStaticBitmapNameStr );
+                    const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxBitmap& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxStaticBitmapNameStr);
+                 const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetBitmap( icon ); }
     virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index cce262cbae..563f1cc4be 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -26,7 +26,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr )
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
     {
         Create( parent, id, label, pos, size, style, name );
     }
@@ -37,7 +37,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr )
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
     {
         Create( parent, id, label, pos, size, style, name );
     }
@@ -48,7 +48,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr )
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
     {
         return DoCreate( parent, id, &label, NULL, pos, size, style, name );
     }
@@ -59,7 +59,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr )
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) )
     {
         return DoCreate( parent, id, NULL, label, pos, size, style, name );
     }
diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index 97501d609a..ad28abaa0b 100644
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -26,13 +26,13 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr);
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticLineNameStr);
+                const wxString &name = wxASCII_STR(wxStaticLineNameStr));
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 37f2939c47..6763447b5e 100644
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -23,7 +23,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -31,7 +31,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
-                const wxString &name = wxStaticTextNameStr );
+                const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     void SetLabel( const wxString &label ) wxOVERRIDE;
 
diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index b343fc9b1a..13bf1a36a5 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -27,7 +27,7 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxTextCtrlNameStr);
+               const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     virtual ~wxTextCtrl();
 
@@ -38,7 +38,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxTextCtrlNameStr);
+                const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     // implement base class pure virtuals
     // ----------------------------------
diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 40869c8b2e..ec36c0fe46 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -30,7 +30,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // Get/set the value
     void SetValue(bool state) wxOVERRIDE;
@@ -90,7 +90,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -102,7 +102,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // deprecated synonym for SetBitmapLabel()
     wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h
index 8ad323b5f0..4ef2756009 100644
--- a/include/wx/gtk/toolbar.h
+++ b/include/wx/gtk/toolbar.h
@@ -25,7 +25,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxTB_DEFAULT_STYLE,
-               const wxString& name = wxToolBarNameStr )
+               const wxString& name = wxASCII_STR(wxToolBarNameStr) )
     {
         Init();
 
@@ -37,7 +37,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxTB_DEFAULT_STYLE,
-                 const wxString& name = wxToolBarNameStr );
+                 const wxString& name = wxASCII_STR(wxToolBarNameStr) );
 
     virtual ~wxToolBar();
 
diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 19227ffa3f..8f0ad658b1 100644
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -27,7 +27,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxTopLevelWindowGTK();
 
diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index f71bc72d82..acabc88e94 100644
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -37,7 +37,7 @@ public:
            const wxString& url = wxWebViewDefaultURLStr,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
-           const wxString& name = wxWebViewNameStr)
+           const wxString& name = wxASCII_STR(wxWebViewNameStr))
     {
         Create(parent, id, url, pos, size, style, name);
     }
@@ -47,7 +47,7 @@ public:
            const wxString& url = wxWebViewDefaultURLStr,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
-           const wxString& name = wxWebViewNameStr) wxOVERRIDE;
+           const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE;
 
     virtual ~wxWebViewWebKit();
 
@@ -195,7 +195,7 @@ public:
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
                               long style = 0,
-                              const wxString& name = wxWebViewNameStr) wxOVERRIDE
+                              const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE
     { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
 };
 
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 16c755c413..9ca1202da1 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -49,13 +49,13 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
     virtual ~wxWindowGTK();
 
     // implement base class (pure) virtual methods
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index d1674e5813..5627930a05 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -26,7 +26,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
+                   const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     void SetLabel( const wxString &label );
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index eddce05960..fb7162e43e 100644
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -26,7 +26,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
+           const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -38,7 +38,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
+           const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );
diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 61e3daa31e..d0bba6282a 100644
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -21,7 +21,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -32,7 +32,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr );
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr) );
 
     void SetValue( bool state );
     bool GetValue() const;
diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 3607ad5dc1..de5f538034 100644
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -38,14 +38,14 @@ public:
             const wxString *choices = (const wxString *)NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
     wxCheckListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
             const wxSize& size,
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool IsChecked(unsigned int index) const;
     void Check(unsigned int index, bool check = true);
diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index cedff268cc..5703e3e202 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -26,7 +26,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr )
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) )
     {
         m_strings = NULL;
 
@@ -38,7 +38,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr )
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) )
     {
         m_strings = NULL;
 
@@ -51,14 +51,14 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
             const wxSize& size,
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     // implement base class pure virtuals
     void DoDeleteOneItem(unsigned int n);
diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 8c54feb568..0008c2c01e 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -45,7 +45,7 @@ public:
            int n = 0, const wxString choices[] = (const wxString *) NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
@@ -56,7 +56,7 @@ public:
            const wxArrayString& choices,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
@@ -70,7 +70,7 @@ public:
            int n = 0, const wxString choices[] = (const wxString *) NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
@@ -78,7 +78,7 @@ public:
            const wxArrayString& choices,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     void DoClear();
     void DoDeleteOneItem(unsigned int n);
diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 2f526a533e..1cf85a23f7 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -42,7 +42,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr)
+             const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -51,7 +51,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
     virtual void SetLabel( const wxString &label );
     virtual wxString GetLabel() const;
diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index d4d068ea40..153c9e2c96 100644
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -23,13 +23,13 @@ public:
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
     bool Create( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
     virtual ~wxDialog() {}
 
     void OnApply( wxCommandEvent &event );
diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 1acbfa6ed1..8a13d8444e 100644
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -21,14 +21,14 @@ public:
     wxFileDialog() { }
 
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
     virtual ~wxFileDialog();
 
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 8d6914525e..94787f8a9e 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -35,7 +35,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxDEFAULT_FRAME_STYLE,
-               const wxString& name = wxFrameNameStr)
+               const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -48,7 +48,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
@@ -56,7 +56,7 @@ public:
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxSTB_DEFAULT_STYLE,
                                          wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+                                         const wxString& name = wxASCII_STR(wxStatusLineNameStr));
 
     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
@@ -64,7 +64,7 @@ public:
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr));
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 89c9baff76..2f0cf907f9 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -25,7 +25,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxGA_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxGaugeNameStr )
+             const wxString& name = wxASCII_STR(wxGaugeNameStr) )
     {
         Init();
 
@@ -38,7 +38,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxGA_HORIZONTAL,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxGaugeNameStr );
+                 const wxString& name = wxASCII_STR(wxGaugeNameStr) );
 
     void SetRange( int r );
     void SetValue( int pos );
diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 407108b5ff..7428d95c93 100644
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -30,7 +30,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr )
+            const wxString& name = wxASCII_STR(wxListBoxNameStr) )
     {
 #if wxUSE_CHECKLISTBOX
         m_hasCheckBoxes = false;
@@ -43,7 +43,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr )
+            const wxString& name = wxASCII_STR(wxListBoxNameStr) )
     {
 #if wxUSE_CHECKLISTBOX
         m_hasCheckBoxes = false;
@@ -58,14 +58,14 @@ public:
                 int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // implement base class pure virtuals
     virtual void DoClear();
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 304d12089e..e752b6591d 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -32,7 +32,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -45,7 +45,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 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
     // version so override this method to find it dynamically
@@ -86,7 +86,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
+                    const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -99,7 +99,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxMDIChildFrame();
 
diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index 8e422a5583..bfc31fe7d2 100644
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -38,7 +38,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
-            const wxString& name = wxFrameNameStr)
+            const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Create(parent, id, title, pos, size, style, name);
     }
@@ -49,7 +49,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
-            const wxString& name = wxFrameNameStr);
+            const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual void SetTitle( const wxString &title );
  // implementation
diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 72bddce086..35696bdf9a 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -34,14 +34,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr);
+             const wxString& name = wxASCII_STR(wxNotebookNameStr));
       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
       // dtor
     virtual ~wxNotebook();
 
diff --git a/include/wx/gtk1/private/addremovectrl.h b/include/wx/gtk1/private/addremovectrl.h
index bce4061df5..3e25f6e88f 100644
--- a/include/wx/gtk1/private/addremovectrl.h
+++ b/include/wx/gtk1/private/addremovectrl.h
@@ -68,7 +68,7 @@ private:
         // GTK UI guidelines recommend using "symbolic" versions of the icons
         // for these buttons, so try them first but fall back to the normal
         // 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() )
             bmp = wxArtProvider::GetBitmap(name, wxART_MENU);
         return bmp;
diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index edcd231196..5198e41c73 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -31,7 +31,7 @@ public:
                int majorDim = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -47,7 +47,7 @@ public:
                int majorDim = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -64,7 +64,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -74,7 +74,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     virtual ~wxRadioBox();
 
diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index f3cbde2024..d958079729 100644
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -24,7 +24,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxRadioButtonNameStr )
+                   const wxString& name = wxASCII_STR(wxRadioButtonNameStr) )
     {
         Create( parent, id, label, pos, size, style, validator, name );
     }
@@ -36,7 +36,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxRadioButtonNameStr );
+                 const wxString& name = wxASCII_STR(wxRadioButtonNameStr) );
 
     virtual void SetLabel(const wxString& label);
     virtual void SetValue(bool val);
diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index ac26af5712..fb22b34a8c 100644
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -31,7 +31,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr )
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) )
     {
         Create( parent, id, pos, size, style, validator, name );
     }
@@ -40,7 +40,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr );
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) );
     virtual ~wxScrollBar();
     int GetThumbPosition() const;
     int GetThumbSize() const;
diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index c4852c55aa..4fb4e507f3 100644
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -24,7 +24,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr)
+             const wxString& name = wxASCII_STR(wxSliderNameStr))
     {
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
@@ -37,7 +37,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     // implement the base class pure virtuals
     virtual int GetValue() const;
diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index ed3f1315c5..3c9eaad0d2 100644
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -25,14 +25,14 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const wxString& name = wxStaticBitmapNameStr );
+                    const wxString& name = wxASCII_STR(wxStaticBitmapNameStr) );
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxBitmap& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxStaticBitmapNameStr);
+                 const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }
     virtual void SetBitmap( const wxBitmap& bitmap );
diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index f94890ce9f..c3e881ae29 100644
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -23,14 +23,14 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) );
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticBoxNameStr) );
 
     virtual void SetLabel( const wxString &label );
 
diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index 8759194cb5..29e8b7fd53 100644
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -26,13 +26,13 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr);
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticLineNameStr);
+                const wxString &name = wxASCII_STR(wxStaticLineNameStr));
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index cb35e6bfcf..66941c6bb0 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -23,7 +23,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -31,7 +31,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
-                const wxString &name = wxStaticTextNameStr );
+                const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     virtual wxString GetLabel() const;
     virtual void SetLabel( const wxString &label );
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index cfc6eaf87b..e7b63006ad 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -25,7 +25,7 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxTextCtrlNameStr);
+               const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     virtual ~wxTextCtrl();
 
@@ -36,7 +36,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxTextCtrlNameStr);
+                const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     // implement base class pure virtuals
     // ----------------------------------
diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index aa0aa8c019..4e243dd11b 100644
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -37,7 +37,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -49,7 +49,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // Get/set the value
     void SetValue(bool state);
@@ -94,7 +94,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -106,7 +106,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // Get/set the value
     void SetValue(bool state);
diff --git a/include/wx/gtk1/toolbar.h b/include/wx/gtk1/toolbar.h
index 0e25d1cb94..ab23653354 100644
--- a/include/wx/gtk1/toolbar.h
+++ b/include/wx/gtk1/toolbar.h
@@ -25,7 +25,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxToolBarNameStr )
+               const wxString& name = wxASCII_STR(wxToolBarNameStr) )
     {
         Init();
 
@@ -37,7 +37,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxToolBarNameStr );
+                 const wxString& name = wxASCII_STR(wxToolBarNameStr) );
 
     virtual ~wxToolBar();
 
diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 90fa3d8508..df43ae9eb4 100644
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -24,7 +24,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -37,7 +37,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxTopLevelWindowGTK();
 
diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index a18cc6d9a2..d5843336b6 100644
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -129,7 +129,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = "wxTreeCtrl") {
+             const wxString& name = wxASCII_STR("wxTreeCtrl")) {
       Create(parent, id, pos, size, style, validator, name);
   }
 
@@ -140,7 +140,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "wxTreeCtrl");
+                const wxString& name = wxASCII_STR("wxTreeCtrl"));
 
     // accessors
     // ---------
diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 76316e11f2..c945cc2f95 100644
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -37,13 +37,13 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
     virtual ~wxWindowGTK();
 
     // implement base class (pure) virtual methods
diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 8d677eec67..3216890f99 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -62,14 +62,14 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHD_DEFAULT_STYLE,
-                 const wxString& name = wxHeaderCtrlNameStr);
+                 const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID winid = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHD_DEFAULT_STYLE,
-                const wxString& name = wxHeaderCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr));
      */
 
     // column-related methods
@@ -273,7 +273,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxHD_DEFAULT_STYLE,
-                       const wxString& name = wxHeaderCtrlNameStr)
+                       const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr))
     {
         Init();
 
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index f8558a3141..94f0bfb05f 100644
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -37,7 +37,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxWebKitCtrlNameStr)
+                    const wxString& name = wxASCII_STR(wxWebKitCtrlNameStr))
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     }
@@ -47,7 +47,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxWebKitCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxWebKitCtrlNameStr));
     virtual ~wxWebKitCtrl();
 
     void LoadURL(const wxString &url);
diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index e936699bbe..34f4cd5741 100644
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -49,7 +49,7 @@ public:
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
-                  const wxString& name = wxHtmlListBoxNameStr);
+                  const wxString& name = wxASCII_STR(wxHtmlListBoxNameStr));
 
     // really creates the control and sets the initial number of items in it
     // (which may be changed later with SetItemCount())
@@ -62,7 +62,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxHtmlListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxHtmlListBoxNameStr));
 
     // destructor cleans up whatever resources we use
     virtual ~wxHtmlListBox();
@@ -215,7 +215,7 @@ public:
                         int n = 0, const wxString choices[] = NULL,
                         long style = wxHLB_DEFAULT_STYLE,
                         const wxValidator& validator = wxDefaultValidator,
-                        const wxString& name = wxSimpleHtmlListBoxNameStr)
+                        const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr))
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
@@ -227,7 +227,7 @@ public:
                         const wxArrayString& choices,
                         long style = wxHLB_DEFAULT_STYLE,
                         const wxValidator& validator = wxDefaultValidator,
-                        const wxString& name = wxSimpleHtmlListBoxNameStr)
+                        const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr))
     {
         Create(parent, id, pos, size, choices, style, validator, name);
     }
@@ -238,14 +238,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSimpleHtmlListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSimpleHtmlListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxSimpleHtmlListBoxNameStr));
 
     virtual ~wxSimpleHtmlListBox();
 
diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 072c05efd3..999f7d9740 100644
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -157,7 +157,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxHL_DEFAULT_STYLE,
-                        const wxString& name = wxHyperlinkCtrlNameStr)
+                        const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr))
             : wxGenericHyperlinkCtrl(parent, id, label, url, pos, size,
                                      style, name)
         {
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index dfb87816da..09a713c322 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -49,7 +49,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxListCtrlNameStr)
+                const wxString &name = wxASCII_STR(wxListCtrlNameStr))
     {
         Create(parent, winid, pos, size, style, validator, name);
     }
diff --git a/include/wx/log.h b/include/wx/log.h
index b15199a2cd..3b506dd777 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -86,8 +86,8 @@ class WXDLLIMPEXP_FWD_BASE wxObject;
 #endif // wxUSE_LOG_TRACE
 
 // wxLOG_COMPONENT identifies the component which generated the log record and
-// can be #define'd to a user-defined value when compiling the user code to use
-// component-based filtering (see wxLog::SetComponentLevel())
+// can be #define'd to a user-defined value (ASCII only) when compiling the
+// user code to use component-based filtering (see wxLog::SetComponentLevel())
 #ifndef wxLOG_COMPONENT
     // this is a variable and not a macro in order to allow the user code to
     // just #define wxLOG_COMPONENT without #undef'ining it first
@@ -205,7 +205,7 @@ public:
     const char *func;
 
     // the name of the component which generated this message, may be NULL if
-    // not set (i.e. wxLOG_COMPONENT not defined)
+    // not set (i.e. wxLOG_COMPONENT not defined). It must be in ASCII.
     const char *component;
 
     // time of record generation
@@ -288,7 +288,7 @@ private:
     ExtraData *m_data;
 };
 
-#define wxLOG_KEY_TRACE_MASK "wx.trace_mask"
+#define wxLOG_KEY_TRACE_MASK wxASCII_STR("wx.trace_mask")
 
 // ----------------------------------------------------------------------------
 // log record: a unit of log output
@@ -804,7 +804,7 @@ public:
     // change the new log target
     void SetLog(wxLog *logger);
 
-    // this can be used to temporarily disable (and then re-enable) passing
+    // this can be used to temporarily disable (and then reenable) passing
     // messages to the old logger (by default we do pass them)
     void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; }
 
@@ -925,7 +925,7 @@ public:
     {
         // remember that fatal errors can't be disabled
         if ( m_level == wxLOG_FatalError ||
-                wxLog::IsLevelEnabled(m_level, m_info.component) )
+                wxLog::IsLevelEnabled(m_level, wxASCII_STR(m_info.component)) )
             DoCallOnLog(format, argptr);
     }
 
@@ -1054,7 +1054,7 @@ private:
 
     void DoLogAtLevel(wxLogLevel level, const wxChar *format, ...)
     {
-        if ( !wxLog::IsLevelEnabled(level, m_info.component) )
+        if ( !wxLog::IsLevelEnabled(level, wxASCII_STR(m_info.component)) )
             return;
 
         va_list argptr;
@@ -1123,7 +1123,7 @@ private:
 
     void DoLogAtLevelUtf8(wxLogLevel level, const char *format, ...)
     {
-        if ( !wxLog::IsLevelEnabled(level, m_info.component) )
+        if ( !wxLog::IsLevelEnabled(level, wxASCII_STR(m_info.component)) )
             return;
 
         va_list argptr;
@@ -1253,7 +1253,7 @@ WXDLLIMPEXP_BASE wxString wxSysErrorMsgStr(unsigned long nErrCode = 0);
 
 // Macro evaluating to true if logging at the given level is enabled.
 #define wxLOG_IS_ENABLED(level) \
-    wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT)
+    wxLog::IsLevelEnabled(wxLOG_##level, wxASCII_STR(wxLOG_COMPONENT))
 
 // Macro used to define most of the actual wxLogXXX() macros: just calls
 // wxLogger::Log(), if logging at the specified level is enabled.
diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 2ebc216fa8..75eeaf44b3 100644
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -50,7 +50,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
      */
 
 #if wxUSE_MENUS
@@ -157,7 +157,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
         And setting m_mdiParent to parent parameter.
      */
diff --git a/include/wx/module.h b/include/wx/module.h
index 2fc8559dd8..993f765e0f 100644
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -74,10 +74,10 @@ protected:
     }
 
     // same as the version above except it will look up wxClassInfo by name on
-    // its own
+    // its own. Note that className must be ASCII
     void AddDependency(const char *className)
     {
-        m_namedDependencies.Add(className);
+        m_namedDependencies.Add(wxASCII_STR(className));
     }
 
 
diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 3ef6ea7865..ec6ae884fc 100644
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr)
+        const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
@@ -33,7 +33,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr);
+        const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     // Implementation
     virtual void ChangeBackgroundColour();
diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 423ea0b90f..aacd066dc4 100644
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -22,7 +22,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr)
+        const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -32,7 +32,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr);
+        const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);
diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index 6ef7405e4e..c951c686ca 100644
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -22,7 +22,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCheckBoxNameStr)
+        const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Init();
 
@@ -33,7 +33,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCheckBoxNameStr);
+        const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
     virtual void SetValue(bool);
     virtual bool GetValue() const ;
     virtual void Command(wxCommandEvent& event);
diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index 7bead5be47..34323c3575 100644
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -28,7 +28,7 @@ public:
         const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     wxCheckListBox(wxWindow *parent, wxWindowID id,
         const wxPoint& pos,
@@ -36,7 +36,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
@@ -44,7 +44,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos,
@@ -52,7 +52,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // items may be checked
     bool IsChecked(unsigned int uiIndex) const;
diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 3d27fe4707..305ff0e586 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -35,7 +35,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr)
+        const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -47,7 +47,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr)
+        const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Init();
         Create(parent, id, pos, size, choices, style, validator, name);
@@ -59,7 +59,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr);
+        const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos,
@@ -67,7 +67,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr);
+        const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
     // implementation of wxControlWithItems
     virtual unsigned int GetCount() const;
diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 7179a01dc0..cae4d10c97 100644
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -29,7 +29,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr)
+        const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         m_inSetSelection = false;
         Create(parent, id, value, pos, size, n, choices,
@@ -43,7 +43,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr)
+        const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         m_inSetSelection = false;
         Create(parent, id, value, pos, size, choices,
@@ -57,7 +57,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr);
+        const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& value,
@@ -66,7 +66,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr);
+        const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     // See wxComboBoxBase discussion of IsEmpty().
     bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 248f092017..4ad4979d65 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -28,7 +28,7 @@ public:
         const wxSize &size = wxDefaultSize,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString &name = wxControlNameStr )
+        const wxString &name = wxASCII_STR(wxControlNameStr) )
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -37,7 +37,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxControlNameStr);
+        const wxString& name = wxASCII_STR(wxControlNameStr));
 
     // simulates the event, returns true if the event was processed
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 600179c553..2895525ef1 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -24,7 +24,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr)
+        const wxString& name = wxASCII_STR(wxDialogNameStr))
     {
         Create(parent, id, title, pos, size, style, name);
     }
@@ -34,7 +34,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr);
+        const wxString& name = wxASCII_STR(wxDialogNameStr));
 
     virtual ~wxDialog();
 
diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index 83f24d769e..6cc86bfe00 100644
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -26,14 +26,14 @@ public:
 
 public:
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
     virtual int ShowModal();
 };
diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 78239dc598..a002647e07 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -21,7 +21,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE,
-        const wxString& name = wxFrameNameStr)
+        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -34,7 +34,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE,
-        const wxString& name = wxFrameNameStr);
+        const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxFrame();
 
@@ -57,7 +57,7 @@ public:
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr);
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr));
     virtual void SetToolBar(wxToolBar *toolbar);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index 6089ea9af0..2a23b51091 100644
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -25,7 +25,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxGA_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxGaugeNameStr)
+        const wxString& name = wxASCII_STR(wxGaugeNameStr))
     {
         Create(parent, id, range, pos, size, style, validator, name);
     }
@@ -36,7 +36,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxGA_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxGaugeNameStr);
+        const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     void SetRange(int r);
     void SetValue(int pos);
diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 96aa3d3466..a14075adf5 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -30,7 +30,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
+        const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
@@ -41,7 +41,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
+        const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Create(parent, id, pos, size, choices, style, validator, name);
     }
@@ -52,7 +52,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos,
@@ -60,7 +60,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // implementation of wxControlWithItems
     virtual unsigned int GetCount() const;
diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h
index 50197cf0d4..6cc31c6659 100644
--- a/include/wx/motif/minifram.h
+++ b/include/wx/motif/minifram.h
@@ -27,7 +27,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
-        const wxString& name = wxFrameNameStr)
+        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         // Use wxFrame constructor in absence of more specific code.
         Create(parent, id, title, pos, size, style, name);
diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index 0a5a73aef2..e6774cc54c 100644
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 public:
     wxMessageDialog(wxWindow *parent,
                     const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
+                    const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                     long style = wxOK | wxCENTRE,
                     const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
         : wxMessageDialogBase(parent, message, caption, style)
diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index a2ad8d7b23..79cb25fa54 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -31,7 +31,7 @@ public:
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0, long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -45,7 +45,7 @@ public:
                const wxArrayString& choices,
                int majorDim = 0, long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -61,7 +61,7 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0, long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
                 const wxPoint& pos,
@@ -69,7 +69,7 @@ public:
                 const wxArrayString& choices,
                 int majorDim = 0, long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     // Enabling
     virtual bool Enable(bool enable = true);
diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index fdaa2ee0b9..43414438a7 100644
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -23,7 +23,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxRadioButtonNameStr)
+        const wxString& name = wxASCII_STR(wxRadioButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -33,7 +33,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxRadioButtonNameStr);
+        const wxString& name = wxASCII_STR(wxRadioButtonNameStr));
 
     virtual void SetValue(bool val);
     virtual bool GetValue() const ;
diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 2881124ce7..69ee968a9b 100644
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -25,7 +25,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxSB_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxScrollBarNameStr)
+        const wxString& name = wxASCII_STR(wxScrollBarNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -34,7 +34,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxSB_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxScrollBarNameStr);
+        const wxString& name = wxASCII_STR(wxScrollBarNameStr));
 
     int GetThumbPosition() const ;
     inline int GetThumbSize() const { return m_pageSize; }
diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index 8d36cb1263..75cd3f4a98 100644
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -27,7 +27,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxSL_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxSliderNameStr)
+        const wxString& name = wxASCII_STR(wxSliderNameStr))
     {
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
@@ -40,7 +40,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxSL_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxSliderNameStr);
+        const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     virtual int GetValue() const ;
     virtual void SetValue(int);
diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index 0934abab5a..02268e7d70 100644
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -25,7 +25,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
-        const wxString& name = "wxSpinButton")
+        const wxString& name = wxASCII_STR("wxSpinButton"))
         : m_up( 0 ),
         m_down( 0 ),
         m_pos( 0 )
@@ -39,7 +39,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
-        const wxString& name = "wxSpinButton");
+        const wxString& name = wxASCII_STR("wxSpinButton"));
 
     // accessors
     int GetValue() const;
diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index a597a040ab..f63fadab50 100644
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -27,7 +27,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticBitmapNameStr)
+        const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -37,7 +37,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticBitmapNameStr);
+        const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetBitmap(const wxBitmap& bitmap);
 
diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 13dc048db5..accc15c11f 100644
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -23,7 +23,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticBoxNameStr)
+        const wxString& name = wxASCII_STR(wxStaticBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -35,7 +35,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticBoxNameStr);
+        const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 2e6ce08699..e8255a2110 100644
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -23,7 +23,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticTextNameStr)
+        const wxString& name = wxASCII_STR(wxStaticTextNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -33,7 +33,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxStaticTextNameStr);
+        const wxString& name = wxASCII_STR(wxStaticTextNameStr));
 
     // implementation
     // --------------
diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index a4ea8ed42d..cc516213f4 100644
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -26,7 +26,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTextCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
     {
         Create(parent, id, value, pos, size, style, validator, name);
     }
@@ -36,7 +36,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTextCtrlNameStr));
 
     // accessors
     // ---------
diff --git a/include/wx/motif/tglbtn.h b/include/wx/motif/tglbtn.h
index 7a9c908b0a..2dcf2e8438 100644
--- a/include/wx/motif/tglbtn.h
+++ b/include/wx/motif/tglbtn.h
@@ -23,7 +23,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxValidator& val = wxDefaultValidator,
-                    const wxString& name = wxCheckBoxNameStr )
+                    const wxString& name = wxASCII_STR(wxCheckBoxNameStr) )
     {
         Init();
 
@@ -35,7 +35,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxValidator& val = wxDefaultValidator,
-                 const wxString &name = wxCheckBoxNameStr );
+                 const wxString &name = wxASCII_STR(wxCheckBoxNameStr) );
 
 protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index b55f72ac82..5f4d3da9bd 100644
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -22,7 +22,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxTB_DEFAULT_STYLE,
-        const wxString& name = wxToolBarNameStr)
+        const wxString& name = wxASCII_STR(wxToolBarNameStr))
     {
         Init();
 
@@ -34,7 +34,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxTB_DEFAULT_STYLE,
-        const wxString& name = wxToolBarNameStr);
+        const wxString& name = wxASCII_STR(wxToolBarNameStr));
 
     virtual ~wxToolBar();
 
diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 5c9f28eb07..f8cbc680e3 100644
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -20,7 +20,7 @@ public:
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
                            long style = wxDEFAULT_FRAME_STYLE,
-                           const wxString& name = wxFrameNameStr )
+                           const wxString& name = wxASCII_STR(wxFrameNameStr) )
     {
         Init();
 
@@ -32,7 +32,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxDEFAULT_FRAME_STYLE,
-                 const wxString& name = wxFrameNameStr );
+                 const wxString& name = wxASCII_STR(wxFrameNameStr) );
 
     virtual ~wxTopLevelWindowMotif();
 
diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index d780c0c241..6029e297ac 100644
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -30,7 +30,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxPanelNameStr)
+             const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -43,7 +43,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // implement base class pure virtuals
     virtual void SetLabel(const wxString& label);
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index ede4038654..3606e0e416 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -242,7 +242,7 @@ protected:
     {
         wxString msg = m_message;
         if ( !m_extendedMessage.empty() )
-            msg << "\n\n" << m_extendedMessage;
+            msg << wxASCII_STR("\n\n") << m_extendedMessage;
 
         return msg;
     }
@@ -316,7 +316,7 @@ private:
 // ----------------------------------------------------------------------------
 
 int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message,
-                             const wxString& caption = wxMessageBoxCaptionStr,
+                             const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                              long style = wxOK | wxCENTRE,
                              wxWindow *parent = NULL,
                              int x = wxDefaultCoord, int y = wxDefaultCoord);
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index ce4e20fed2..983db43b85 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -27,7 +27,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
+                   const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
@@ -39,7 +39,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
 protected:
     wxDECLARE_EVENT_TABLE();
diff --git a/include/wx/msw/bmpcbox.h b/include/wx/msw/bmpcbox.h
index d71fc8d728..ef7d462b4d 100644
--- a/include/wx/msw/bmpcbox.h
+++ b/include/wx/msw/bmpcbox.h
@@ -38,7 +38,7 @@ public:
                      const wxString choices[] = NULL,
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr)
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr))
         : wxComboBox(),
           wxBitmapComboBoxBase()
     {
@@ -56,7 +56,7 @@ public:
                      const wxArrayString& choices,
                      long style,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxBitmapComboBoxNameStr);
+                     const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -67,7 +67,7 @@ public:
                 const wxString choices[],
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -77,7 +77,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxBitmapComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxBitmapComboBoxNameStr));
 
     virtual ~wxBitmapComboBox();
 
diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 980a9b4cad..20d62b7d84 100644
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -26,7 +26,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
+             const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual ~wxButton();
 
diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index e455205a71..1f15b1b617 100644
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -19,7 +19,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxCAL_SHOW_HOLIDAYS,
-                   const wxString& name = wxCalendarNameStr)
+                   const wxString& name = wxASCII_STR(wxCalendarNameStr))
     {
         Init();
 
@@ -32,7 +32,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS,
-                const wxString& name = wxCalendarNameStr);
+                const wxString& name = wxASCII_STR(wxCalendarNameStr));
 
     virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
     virtual wxDateTime GetDate() const wxOVERRIDE;
diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index e8d042a1d6..b4cc0bf37f 100644
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -25,7 +25,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxCheckBoxNameStr)
+               const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -37,7 +37,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     virtual void SetValue(bool value) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 91180c6a3e..e00797787b 100644
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -30,14 +30,14 @@ public:
                    const wxString choices[] = NULL,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr));
     wxCheckListBox(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos,
                    const wxSize& size,
                    const wxArrayString& choices,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -45,14 +45,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // items may be checked
     virtual bool IsChecked(unsigned int uiIndex) const wxOVERRIDE;
diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index e331c0946d..6c8badd69f 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -31,7 +31,7 @@ public:
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
+             const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
@@ -44,7 +44,7 @@ public:
              const wxArrayString& choices,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
+             const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Init();
         Create(parent, id, pos, size, choices, style, validator, name);
@@ -57,7 +57,7 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos,
@@ -65,7 +65,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
     virtual bool Show(bool show = true) wxOVERRIDE;
 
diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index 0bd10d8f62..f96222f875 100644
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -45,7 +45,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxComboBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxComboBoxNameStr))
         : wxComboCtrlBase()
     {
         Init();
@@ -60,7 +60,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual ~wxComboCtrl();
 
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 1e0a6e6182..3114d41b0d 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -33,7 +33,7 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr)
+            const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Init();
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
@@ -47,7 +47,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr)
+            const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Init();
 
@@ -63,7 +63,7 @@ public:
                 const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& value,
@@ -72,7 +72,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     // See wxComboBoxBase discussion of IsEmpty().
     bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
diff --git a/include/wx/msw/commandlinkbutton.h b/include/wx/msw/commandlinkbutton.h
index f338a1f998..8930e33127 100644
--- a/include/wx/msw/commandlinkbutton.h
+++ b/include/wx/msw/commandlinkbutton.h
@@ -31,7 +31,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = 0,
                         const wxValidator& validator = wxDefaultValidator,
-                        const wxString& name = wxButtonNameStr)
+                        const wxString& name = wxASCII_STR(wxButtonNameStr))
         : wxGenericCommandLinkButton()
     {
         Create(parent, id, mainLabel, note, pos, size, style, validator, name);
@@ -45,7 +45,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     // overridden base class methods
     // -----------------------------
diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index cf754e9ffe..346c2174b7 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -23,7 +23,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,
               const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxControlNameStr)
+              const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -32,7 +32,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
 
     // Simulates an event
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 12a4651375..ce9e534e02 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -29,7 +29,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
+             const wxString& name = wxASCII_STR(wxDialogNameStr))
     {
         Init();
 
@@ -41,7 +41,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDialogNameStr));
 
     virtual ~wxDialog();
 
diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index b99ff5b4f8..e17af4b65c 100644
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -15,12 +15,12 @@ class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
 public:
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
     void SetPath(const wxString& path) wxOVERRIDE;
 
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index a83192b6e9..37a9aca01a 100644
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -19,14 +19,14 @@ class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
 public:
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
     virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
     virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE;
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 13cb625b8d..afee10d7df 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -26,7 +26,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+            const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
     virtual ~wxFrame();
 
     // implement base class pure virtuals
@@ -55,7 +55,7 @@ public:
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr) wxOVERRIDE;
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE;
 #endif // wxUSE_TOOLBAR
 
     // Status bar
@@ -63,7 +63,7 @@ public:
     virtual wxStatusBar* OnCreateStatusBar(int number = 1,
                                            long style = wxSTB_DEFAULT_STYLE,
                                            wxWindowID id = 0,
-                                           const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
+                                           const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE;
 
     // Hint to tell framework which status bar to use: the default is to use
     // native one for the platforms which support it (Win32), the generic one
diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h
index 3fb4434272..bd12b0192f 100644
--- a/include/wx/msw/gauge.h
+++ b/include/wx/msw/gauge.h
@@ -28,7 +28,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxGaugeNameStr)
+            const wxString& name = wxASCII_STR(wxGaugeNameStr))
     {
         (void)Create(parent, id, range, pos, size, style, validator, name);
     }
@@ -42,7 +42,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxGA_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
+                const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     // set gauge range/value
     virtual void SetRange(int range) wxOVERRIDE;
diff --git a/include/wx/msw/headerctrl.h b/include/wx/msw/headerctrl.h
index 80d042eee9..b099ccd412 100644
--- a/include/wx/msw/headerctrl.h
+++ b/include/wx/msw/headerctrl.h
@@ -31,7 +31,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHD_DEFAULT_STYLE,
-                 const wxString& name = wxHeaderCtrlNameStr)
+                 const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr))
     {
         Init();
 
@@ -43,7 +43,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHD_DEFAULT_STYLE,
-                const wxString& name = wxHeaderCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr));
 
     // Window style handling.
     virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
diff --git a/include/wx/msw/hyperlink.h b/include/wx/msw/hyperlink.h
index 8a06771099..fe54820774 100644
--- a/include/wx/msw/hyperlink.h
+++ b/include/wx/msw/hyperlink.h
@@ -29,7 +29,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxHL_DEFAULT_STYLE,
-                    const wxString& name = wxHyperlinkCtrlNameStr)
+                    const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr))
     {
         (void)Create(parent, id, label, url, pos, size, style, name);
     }
@@ -41,7 +41,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHL_DEFAULT_STYLE,
-                const wxString& name = wxHyperlinkCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxHyperlinkCtrlNameStr));
 
 
     // overridden base class methods
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 78e310b306..88eff303a1 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -44,7 +44,7 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
+            const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Init();
 
@@ -56,7 +56,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
+            const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Init();
 
@@ -69,14 +69,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual ~wxListBox();
 
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index bafac8bc09..64bac9ca90 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -87,7 +87,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxListCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxListCtrlNameStr))
     {
         Init();
 
@@ -102,7 +102,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxListCtrlNameStr));
 
 
     // Attributes
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index c0fd25282b..209fdd5277 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -30,7 +30,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -45,7 +45,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // override/implement base class [pure] virtual methods
     // ----------------------------------------------------
@@ -182,7 +182,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
+                    const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -195,7 +195,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxMDIChildFrame();
 
diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index c6d86c99da..fe72023b2e 100644
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -24,7 +24,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
-              const wxString& name = wxFrameNameStr)
+              const wxString& name = wxASCII_STR(wxFrameNameStr))
   {
       return wxFrame::Create(parent, id, title, pos, size,
                              style |
@@ -38,7 +38,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
-              const wxString& name = wxFrameNameStr)
+              const wxString& name = wxASCII_STR(wxFrameNameStr))
   {
       Create(parent, id, title, pos, size, style, name);
   }
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 67c81091ba..8996ee9c1b 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 public:
     wxMessageDialog(wxWindow *parent,
                     const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
+                    const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                     long style = wxOK|wxCENTRE,
                     const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
         : wxMessageDialogBase(parent, message, caption, style)
diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 316f1d0338..b6a05ce637 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -35,14 +35,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr);
+             const wxString& name = wxASCII_STR(wxNotebookNameStr));
     // Create() function
   bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
   virtual ~wxNotebook();
 
   // accessors
diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h
index 86ba5ec6de..0a1b980473 100644
--- a/include/wx/msw/panel.h
+++ b/include/wx/msw/panel.h
@@ -26,7 +26,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
+            const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Create(parent, winid, pos, size, style, name);
     }
@@ -36,7 +36,7 @@ public:
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
             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);
     }
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 1564093a19..6c46e7e16b 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -33,7 +33,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -50,7 +50,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -69,7 +69,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -79,7 +79,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     // implement the radiobox interface
     virtual void SetSelection(int n) wxOVERRIDE;
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index a9621cdff2..a568316edf 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -26,7 +26,7 @@ public:
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = wxRadioButtonNameStr)
+                  const wxString& name = wxASCII_STR(wxRadioButtonNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRadioButtonNameStr);
+                const wxString& name = wxASCII_STR(wxRadioButtonNameStr));
 
     // implement the radio button interface
     virtual void SetValue(bool value);
diff --git a/include/wx/msw/richmsgdlg.h b/include/wx/msw/richmsgdlg.h
index a1fb60e808..2e24328c2c 100644
--- a/include/wx/msw/richmsgdlg.h
+++ b/include/wx/msw/richmsgdlg.h
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog
 public:
     wxRichMessageDialog(wxWindow *parent,
                         const wxString& message,
-                        const wxString& caption = wxMessageBoxCaptionStr,
+                        const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                         long style = wxOK | wxCENTRE)
         : wxGenericRichMessageDialog(parent, message, caption, style)
         { }
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index e313f09594..2e8c9aff81 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -23,7 +23,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxSB_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxScrollBarNameStr)
+            const wxString& name = wxASCII_STR(wxScrollBarNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -32,7 +32,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxSB_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxScrollBarNameStr);
+            const wxString& name = wxASCII_STR(wxScrollBarNameStr));
 
     int GetThumbPosition() const wxOVERRIDE;
     int GetThumbSize() const wxOVERRIDE { return m_pageSize; }
diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index 57495d1568..7aaad33bd5 100644
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -28,7 +28,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr)
+             const wxString& name = wxASCII_STR(wxSliderNameStr))
     {
         Init();
 
@@ -44,7 +44,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     virtual ~wxSlider();
 
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fb437c9206..990483d06a 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -29,7 +29,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = wxStaticBitmapNameStr)
+                   const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
     {
         Init();
 
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual ~wxStaticBitmap() { Free(); }
 
diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 294f1519ae..4b9bc2b565 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -27,7 +27,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr)
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr))
         : wxCompositeWindowSettersOnly<wxStaticBoxBase>()
     {
         Create(parent, id, label, pos, size, style, name);
@@ -38,7 +38,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString &name = wxStaticBoxNameStr)
+                const wxString &name = wxASCII_STR(wxStaticBoxNameStr))
         : wxCompositeWindowSettersOnly<wxStaticBoxBase>()
     {
         Create(parent, id, label, pos, size, style, name);
@@ -49,14 +49,14 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
                 wxWindow* label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     /// Implementation only
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 2ca5f594e2..e90dd61d39 100644
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -25,7 +25,7 @@ public:
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticLineNameStr )
+                  const wxString &name = wxASCII_STR(wxStaticLineNameStr) )
     {
         Create(parent, id, pos, size, style, name);
     }
@@ -35,7 +35,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
     // overridden base class virtuals
     virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 9c9f0fb227..82687f2ea7 100644
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -22,7 +22,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxStaticTextNameStr)
+                 const wxString& name = wxASCII_STR(wxStaticTextNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -33,7 +33,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticTextNameStr);
+                const wxString& name = wxASCII_STR(wxStaticTextNameStr));
 
     // override some methods to resize the window properly
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index a503a8c1e4..bc554e9ee6 100644
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -26,7 +26,7 @@ public:
     wxStatusBar(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr)
+                const wxString& name = wxASCII_STR(wxStatusBarNameStr))
     {
         m_pDC = NULL;
         (void)Create(parent, id, style, name);
@@ -35,7 +35,7 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr);
+                const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     virtual ~wxStatusBar();
 
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index b173df4575..7a804e2617 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -24,7 +24,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTextCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
     {
         Init();
 
@@ -38,7 +38,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTextCtrlNameStr));
 
     // overridden wxTextEntry methods
     // ------------------------------
diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index d04d50fa79..b9658ad106 100644
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -26,7 +26,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -38,7 +38,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     virtual void SetValue(bool value) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
@@ -82,7 +82,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -94,7 +94,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // deprecated synonym for SetBitmapLabel()
     wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index 1fa4a5260b..f01cd4e856 100644
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -27,7 +27,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTB_DEFAULT_STYLE,
-                const wxString& name = wxToolBarNameStr)
+                const wxString& name = wxASCII_STR(wxToolBarNameStr))
     {
         Init();
 
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTB_DEFAULT_STYLE,
-                const wxString& name = wxToolBarNameStr);
+                const wxString& name = wxASCII_STR(wxToolBarNameStr));
 
     virtual ~wxToolBar();
 
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 5412de421e..3b52341376 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -29,7 +29,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxTopLevelWindowMSW();
 
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 11a654429d..0e62b89197 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -53,7 +53,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTreeCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTreeCtrlNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -65,7 +65,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTreeCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTreeCtrlNameStr));
 
     // implement base class pure virtuals
     // ----------------------------------
diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index eb843f68a3..a7fb5e3171 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -55,7 +55,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxWebViewNameStr)
+           const wxString& name = wxASCII_STR(wxWebViewNameStr))
    {
        Create(parent, id, url, pos, size, style, name);
    }
@@ -68,7 +68,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxWebViewNameStr) wxOVERRIDE;
+           const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE;
 
     virtual void LoadURL(const wxString& url) wxOVERRIDE;
     virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) wxOVERRIDE;
@@ -190,7 +190,7 @@ public:
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
                               long style = 0,
-                              const wxString& name = wxWebViewNameStr) wxOVERRIDE
+                              const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE
     { return new wxWebViewIE(parent, id, url, pos, size, style, name); }
 };
 
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 47203237f1..7f2f5c9575 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -52,7 +52,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         return CreateUsingMSWClass(GetMSWClassName(style),
                                    parent, id, pos, size, style, name);
@@ -68,7 +68,7 @@ public:
                              const wxPoint& pos = wxDefaultPosition,
                              const wxSize& size = wxDefaultSize,
                              long style = 0,
-                             const wxString& name = wxPanelNameStr);
+                             const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // implement base class pure virtuals
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 7895179c32..d147cd49b0 100644
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -251,7 +251,7 @@ public:
                          const wxString choices[],
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
-                         const wxString& name = wxComboBoxNameStr)
+                         const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Init();
 
@@ -266,7 +266,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     wxOwnerDrawnComboBox(wxWindow *parent,
                          wxWindowID id,
@@ -276,7 +276,7 @@ public:
                          const wxArrayString& choices = wxArrayString(),
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
-                         const wxString& name = wxComboBoxNameStr);
+                         const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -287,7 +287,7 @@ public:
                 const wxString choices[],
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -297,7 +297,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual ~wxOwnerDrawnComboBox();
 
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index fb2a62ae28..8d060516f9 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -26,7 +26,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
+                   const wxString& name = wxASCII_STR(wxButtonNameStr))
         {
             Create(parent, id, bitmap, pos, size, style, validator, name);
         }
@@ -35,7 +35,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
 protected:
 
diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index cf20fbcb56..162ad27507 100644
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -26,7 +26,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
+             const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -38,7 +38,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
     virtual wxWindow *SetDefault() wxOVERRIDE;
diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index 9734b60413..87bae724a8 100644
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -20,7 +20,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -29,7 +29,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
     virtual void SetValue(bool) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
 
@@ -60,7 +60,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -69,7 +69,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
     virtual void SetValue(bool) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
     virtual void SetLabel(const wxBitmap *bitmap);
diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index 3039639a54..5c085c6828 100644
--- a/include/wx/osx/checklst.h
+++ b/include/wx/osx/checklst.h
@@ -25,7 +25,7 @@ public:
                    const wxString *choices = NULL,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Init();
 
@@ -38,7 +38,7 @@ public:
                    const wxArrayString& choices,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Init();
 
@@ -53,7 +53,7 @@ public:
                 const wxString *choices = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos,
@@ -61,7 +61,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // items may be checked
     bool  IsChecked(unsigned int uiIndex) const wxOVERRIDE;
diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index ca3984a6d5..37486f8a7c 100644
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -36,7 +36,7 @@ public:
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
+             const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
@@ -46,7 +46,7 @@ public:
              const wxArrayString& choices,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
+             const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Create(parent, id, pos, size, choices, style, validator, name);
     }
@@ -57,14 +57,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
     virtual unsigned int GetCount() const wxOVERRIDE;
     virtual int GetSelection() const wxOVERRIDE;
diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 3d00efd9b8..7ee424fff0 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -47,7 +47,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
@@ -59,7 +59,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
            const wxArrayString& choices,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
@@ -71,7 +71,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
@@ -80,7 +80,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
            const wxArrayString& choices,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
+           const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual int GetSelection() const wxOVERRIDE;
     virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index e259e928e7..f520ddac5e 100644
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -24,7 +24,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr)
+             const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Create(parent, winid, pos, size, style, validator, name);
     }
@@ -33,7 +33,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
    // Simulates an event
    virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); }
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index 836581e2a8..a7a58d6f54 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -134,7 +134,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxDataViewCtrlNameStr )
+                 const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr) )
   {
     Init();
     Create(parent, winid, pos, size, style, validator, name);
@@ -148,7 +148,7 @@ public:
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxDataViewCtrlNameStr);
+              const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr));
 
   virtual wxWindow* GetMainWindow() // not used for the native implementation
   {
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 2e0c7a847f..7abbc7493a 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -30,7 +30,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
+             const wxString& name = wxASCII_STR(wxDialogNameStr))
     {
         Init();
         Create(parent, id, title, pos, size, style, name);
@@ -41,7 +41,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDialogNameStr));
 
     virtual ~wxDialog();
 
diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index 66646c8a4f..f8ab61110c 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -21,12 +21,12 @@ public:
     wxDirDialog() { Init(); }
 
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxT(""),
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr)
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr))
     {
         Init();
 
@@ -34,12 +34,12 @@ public:
     }
 
     void Create(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxT(""),
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
 #if wxOSX_USE_COCOA
     ~wxDirDialog();
diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index 38295ac8a5..9278239bfc 100644
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -32,14 +32,14 @@ protected:
 public:
     wxFileDialog() { Init(); }
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr)
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr))
     {
         Init();
 
@@ -47,14 +47,14 @@ public:
     }
 
     void Create(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
 #if wxOSX_USE_COCOA
     ~wxFileDialog();
diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 4ced3174c9..155e7ccf3a 100644
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -28,7 +28,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+            const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Create(parent, id, title, pos, size, style, name);
     }
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // implementation only from now on
     // -------------------------------
@@ -60,7 +60,7 @@ public:
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr) wxOVERRIDE;
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE;
 
     virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
 #endif // wxUSE_TOOLBAR
@@ -70,7 +70,7 @@ public:
     virtual wxStatusBar* OnCreateStatusBar(int number = 1,
                                            long style = wxSTB_DEFAULT_STYLE,
                                            wxWindowID id = 0,
-                                           const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
+                                           const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE;
 #endif // wxUSE_STATUSBAR
 
     void PositionBars();
diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index c4d22dbfa1..fe012ad03d 100644
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr)
+           const wxString& name = wxASCII_STR(wxGaugeNameStr))
   {
     Create(parent, id, range, pos, size, style, validator, name);
   }
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr);
+           const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     // set gauge range/value
     virtual void SetRange(int range) wxOVERRIDE;
diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index 3581f5611e..5e8949e700 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -49,7 +49,7 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
+        const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Create(parent, winid, pos, size, n, choices, style, validator, name);
     }
@@ -62,7 +62,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
+        const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Create(parent, winid, pos, size, choices, style, validator, name);
     }
@@ -76,7 +76,7 @@ public:
         const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(
         wxWindow *parent,
@@ -86,7 +86,7 @@ public:
         const wxArrayString& choices,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
+        const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual ~wxListBox();
 
diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index ad6d5cc5fe..9557380612 100644
--- a/include/wx/osx/mdi.h
+++ b/include/wx/osx/mdi.h
@@ -22,7 +22,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
         Create(parent, id, title, pos, size, style, name);
@@ -34,7 +34,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxMDIParentFrame();
 
@@ -102,7 +102,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
+                    const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init() ;
         Create(parent, id, title, pos, size, style, name);
@@ -114,7 +114,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxMDIChildFrame();
 
diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index a4180f975e..5b06f33b13 100644
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -27,7 +27,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION,
-           const wxString& name = wxFrameNameStr)
+           const wxString& name = wxASCII_STR(wxFrameNameStr))
   {
       // Use wxFrame constructor in absence of more specific code.
       Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name);
diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 1374ebda85..e82e1c8e5e 100644
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 public:
     wxMessageDialog(wxWindow *parent,
                     const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
+                    const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index af2c7bf3ed..48dc9fac3f 100644
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -42,7 +42,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = 0,
-                        const wxString& name = wxPanelNameStr)
+                        const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
 
@@ -54,7 +54,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     bool Create(wxWindow *parent, WXWindow nativeWindow);
 
diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index c8e706f080..13eca4415f 100644
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -40,7 +40,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr)
+             const wxString& name = wxASCII_STR(wxNotebookNameStr))
     { Create( parent, id, pos, size, style, name ); }
     // Create() function
   bool Create(wxWindow *parent,
@@ -48,7 +48,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
     // dtor
   virtual ~wxNotebook();
 
diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index c147241dbe..9f710cc3f8 100644
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -28,7 +28,7 @@ public:
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
+             const wxValidator& val = wxDefaultValidator, const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
         {
             Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
         }
@@ -37,7 +37,7 @@ public:
              const wxArrayString& choices,
              int majorDim = 0, long style = wxRA_SPECIFY_COLS,
              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);
@@ -47,13 +47,13 @@ public:
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
+             const wxValidator& val = wxDefaultValidator, const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos, const wxSize& size,
              const wxArrayString& choices,
              int majorDim = 0, long style = wxRA_SPECIFY_COLS,
              const wxValidator& val = wxDefaultValidator,
-             const wxString& name = wxRadioBoxNameStr);
+             const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     // Enabling
     virtual bool Enable(bool enable = true) wxOVERRIDE;
diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 73291b8d02..e968d80acd 100644
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -22,7 +22,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr)
+           const wxString& name = wxASCII_STR(wxRadioButtonNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -33,7 +33,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr);
+           const wxString& name = wxASCII_STR(wxRadioButtonNameStr));
 
     virtual void SetValue(bool val);
     virtual bool GetValue() const ;
diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index fdfc105d97..1142ec0064 100644
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -24,7 +24,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr)
+                const wxString& name = wxASCII_STR(wxScrollBarNameStr))
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -34,7 +34,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
+                const wxString& name = wxASCII_STR(wxScrollBarNameStr));
 
     virtual int GetThumbPosition() const wxOVERRIDE;
     virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; }
diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index 848da62e72..70915e44bb 100644
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -28,7 +28,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = wxSL_HORIZONTAL,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxSliderNameStr)
+                    const wxString& name = wxASCII_STR(wxSliderNameStr))
     {
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
@@ -41,7 +41,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     virtual int GetValue() const wxOVERRIDE;
     virtual void SetValue(int) wxOVERRIDE;
diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 2bef62b75e..1fdc12cd4a 100644
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -27,7 +27,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxSearchCtrlNameStr);
+               const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
 
     virtual ~wxSearchCtrl();
 
@@ -37,7 +37,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSearchCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxSearchCtrlNameStr));
 
 #if wxUSE_MENUS
     // get/set search button menu
diff --git a/include/wx/osx/statbmp.h b/include/wx/osx/statbmp.h
index 4ba4e069d0..93d5cf836e 100644
--- a/include/wx/osx/statbmp.h
+++ b/include/wx/osx/statbmp.h
@@ -13,7 +13,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = 0,
-                          const wxString& name = wxStaticBitmapNameStr)
+                          const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
     {
         Create(parent, id, bitmap, pos, size, style, name);
     }
@@ -24,7 +24,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
 
diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index 364c478fd2..6c0422b9a8 100644
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -22,7 +22,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxStaticBoxNameStr)
+           const wxString& name = wxASCII_STR(wxStaticBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -32,7 +32,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxStaticBoxNameStr);
+           const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     virtual void Command(wxCommandEvent& WXUNUSED(event)) wxOVERRIDE {}
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
diff --git a/include/wx/osx/statline.h b/include/wx/osx/statline.h
index 204c8759bc..6401a77fed 100644
--- a/include/wx/osx/statline.h
+++ b/include/wx/osx/statline.h
@@ -27,7 +27,7 @@ public:
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticLineNameStr )
+                  const wxString &name = wxASCII_STR(wxStaticLineNameStr) )
         : m_statbox(NULL)
     {
         Create(parent, id, pos, size, style, name);
@@ -38,7 +38,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
     // it's necessary to override this wxWindow function because we
     // will want to return the main widget for m_statbox
diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 87136c1861..89146a18df 100644
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -21,7 +21,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxStaticTextNameStr)
+           const wxString& name = wxASCII_STR(wxStaticTextNameStr))
   {
     Create(parent, id, label, pos, size, style, name);
   }
@@ -31,7 +31,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxStaticTextNameStr);
+           const wxString& name = wxASCII_STR(wxStaticTextNameStr));
 
   // accessors
   void SetLabel( const wxString &str ) wxOVERRIDE;
diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index d94c87de37..9b6e84e56a 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -18,13 +18,13 @@ public:
     wxStatusBarMac();
     wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
            long style = wxSTB_DEFAULT_STYLE,
-           const wxString& name = wxStatusBarNameStr);
+           const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     virtual ~wxStatusBarMac();
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
               long style = wxSTB_DEFAULT_STYLE,
-              const wxString& name = wxStatusBarNameStr);
+              const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     // Implementation
     virtual void MacHiliteChanged() wxOVERRIDE;
diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 4afe69def4..d3bb9ce057 100644
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -40,7 +40,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxTextCtrlNameStr)
+        const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
     {
         Init();
         Create(parent, id, value, pos, size, style, validator, name);
@@ -55,7 +55,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxTextCtrlNameStr);
+        const wxString& name = wxASCII_STR(wxTextCtrlNameStr));
 
     // accessors
     // ---------
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 8f7697b334..3099c5cd5d 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -23,7 +23,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -35,7 +35,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     virtual void SetValue(bool value) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
@@ -63,7 +63,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
@@ -75,7 +75,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton);
diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 52febf14a3..983d1ec49b 100644
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -29,7 +29,7 @@ public:
   wxToolBar(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                    long style = wxTB_DEFAULT_STYLE,
-                   const wxString& name = wxToolBarNameStr)
+                   const wxString& name = wxASCII_STR(wxToolBarNameStr))
   {
     Init();
     Create(parent, id, pos, size, style, name);
@@ -38,7 +38,7 @@ public:
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxTB_DEFAULT_STYLE,
-            const wxString& name = wxToolBarNameStr);
+            const wxString& name = wxASCII_STR(wxToolBarNameStr));
 
     virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
 
diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index c54528d97a..bde2671a14 100644
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -27,7 +27,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -42,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     bool Create(wxWindow *parent, WXWindow nativeWindow);
 
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 96a57a1708..d7c8a91e5f 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -33,19 +33,19 @@ public:
     wxWebViewWebKit() {}
     wxWebViewWebKit(wxWindow *parent,
                     wxWindowID winID = wxID_ANY,
-                    const wxString& strURL = wxWebViewDefaultURLStr,
+                    const wxString& strURL = wxASCII_STR(wxWebViewDefaultURLStr),
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxString& name = wxWebViewNameStr)
+                    const wxString& name = wxASCII_STR(wxWebViewNameStr))
     {
         Create(parent, winID, strURL, pos, size, style, name);
     }
     bool Create(wxWindow *parent,
                 wxWindowID winID = wxID_ANY,
-                const wxString& strURL = wxWebViewDefaultURLStr,
+                const wxString& strURL = wxASCII_STR(wxWebViewDefaultURLStr),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
-                const wxString& name = wxWebViewNameStr) wxOVERRIDE;
+                const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE;
     virtual ~wxWebViewWebKit();
 
     virtual bool CanGoBack() const wxOVERRIDE;
@@ -181,7 +181,7 @@ public:
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
                               long style = 0,
-                              const wxString& name = wxWebViewNameStr)
+                              const wxString& name = wxASCII_STR(wxWebViewNameStr))
     { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
 };
 
diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 2b14153541..19cd7d21d7 100644
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -40,7 +40,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr );
+                const wxString& name = wxASCII_STR(wxPanelNameStr) );
 
     virtual ~wxWindowMac();
 
@@ -49,7 +49,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr );
+                const wxString& name = wxASCII_STR(wxPanelNameStr) );
 
     virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
 
diff --git a/include/wx/panel.h b/include/wx/panel.h
index e11db6728b..d07724ae7b 100644
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -39,7 +39,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
     */
 
     // Pseudo ctor
@@ -48,7 +48,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
 
     // implementation from now on
diff --git a/include/wx/persist/dataview.h b/include/wx/persist/dataview.h
index ee10c02480..e673eedac6 100644
--- a/include/wx/persist/dataview.h
+++ b/include/wx/persist/dataview.h
@@ -58,8 +58,8 @@ public:
             const wxString columnPrefix = MakeColumnPrefix(column);
 
             // Save the column attributes.
-            SaveValue(columnPrefix + wxPERSIST_DVC_HIDDEN, column->IsHidden());
-            SaveValue(columnPrefix + wxPERSIST_DVC_POS,
+            SaveValue(columnPrefix + wxASCII_STR(wxPERSIST_DVC_HIDDEN), column->IsHidden());
+            SaveValue(columnPrefix + wxASCII_STR(wxPERSIST_DVC_POS),
                       control->GetColumnPosition(column));
 
             // We take special care to save only the specified width instead of
@@ -69,7 +69,7 @@ public:
             // entire control width.
             const int width = column->WXGetSpecifiedWidth();
             if ( width > 0 )
-                SaveValue(columnPrefix + wxPERSIST_DVC_WIDTH, width);
+                SaveValue(columnPrefix + wxASCII_STR(wxPERSIST_DVC_WIDTH), width);
 
             // Check if this column is the current sort key.
             if ( column->IsSortKey() )
@@ -84,8 +84,8 @@ public:
         // Save the sort key and direction if there is a valid sort.
         if ( sortColumn )
         {
-            SaveValue(wxPERSIST_DVC_SORT_KEY, sortColumn->GetTitle());
-            SaveValue(wxPERSIST_DVC_SORT_ASC,
+            SaveValue(wxASCII_STR(wxPERSIST_DVC_SORT_KEY), sortColumn->GetTitle());
+            SaveValue(wxASCII_STR(wxPERSIST_DVC_SORT_ASC),
                       sortColumn->IsSortOrderAscending());
         }
     }
@@ -105,12 +105,12 @@ public:
 
             // Restore column hidden status.
             bool hidden;
-            if ( RestoreValue(columnPrefix + wxPERSIST_DVC_HIDDEN, &hidden) )
+            if ( RestoreValue(columnPrefix + wxASCII_STR(wxPERSIST_DVC_HIDDEN), &hidden) )
                 column->SetHidden(hidden);
 
             // Restore the column width.
             int width;
-            if ( RestoreValue(columnPrefix + wxPERSIST_DVC_WIDTH, &width) )
+            if ( RestoreValue(columnPrefix + wxASCII_STR(wxPERSIST_DVC_WIDTH), &width) )
                 column->SetWidth(width);
 
             // TODO: Set the column's view position.
@@ -120,13 +120,13 @@ public:
         // criteria.
         wxString sortColumn;
         if ( control->GetModel() &&
-             RestoreValue(wxPERSIST_DVC_SORT_KEY, &sortColumn) &&
+             RestoreValue(wxASCII_STR(wxPERSIST_DVC_SORT_KEY), &sortColumn) &&
              !sortColumn.empty() )
         {
             bool sortAsc = true;
             if ( wxDataViewColumn* column = GetColumnByTitle(control, sortColumn) )
             {
-                RestoreValue(wxPERSIST_DVC_SORT_ASC, &sortAsc);
+                RestoreValue(wxASCII_STR(wxPERSIST_DVC_SORT_ASC), &sortAsc);
                 column->SetSortOrder(sortAsc);
 
                 // Resort the control based on the new sort criteria.
@@ -139,14 +139,14 @@ public:
 
     virtual wxString GetKind() const wxOVERRIDE
     {
-        return wxPERSIST_DVC_KIND;
+        return wxASCII_STR(wxPERSIST_DVC_KIND);
     }
 
 private:
     // Return a (slash-terminated) prefix for the column-specific entries.
     static wxString MakeColumnPrefix(const wxDataViewColumn* column)
     {
-        return wxString::Format("/Columns/%s/", column->GetTitle());
+        return wxString::Format(wxASCII_STR("/Columns/%s/"), column->GetTitle());
     }
 
     // Return the column with the given title or NULL.
diff --git a/include/wx/persist/toplevel.h b/include/wx/persist/toplevel.h
index c1bec8667a..5fd78c2864 100644
--- a/include/wx/persist/toplevel.h
+++ b/include/wx/persist/toplevel.h
@@ -51,7 +51,7 @@ public:
         return tlw->RestoreToGeometry(*this);
     }
 
-    virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; }
+    virtual wxString GetKind() const wxOVERRIDE { return wxASCII_STR(wxPERSIST_TLW_KIND); }
 
 private:
     virtual bool SaveField(const wxString& name, int value) const wxOVERRIDE
diff --git a/include/wx/persist/treebook.h b/include/wx/persist/treebook.h
index 9a38296879..f3026642f4 100644
--- a/include/wx/persist/treebook.h
+++ b/include/wx/persist/treebook.h
@@ -51,7 +51,7 @@ public:
                 if ( !expanded.empty() )
                     expanded += wxPERSIST_TREEBOOK_EXPANDED_SEP;
 
-                expanded += wxString::Format("%u", static_cast<unsigned>(n));
+                expanded += wxString::Format(wxASCII_STR("%u"), static_cast<unsigned>(n));
             }
         }
 
diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index fc63379b90..a4af0a629c 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -50,7 +50,7 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxButtonNameStr);
+                    const wxString& name = wxASCII_STR(wxButtonNameStr));
 
 public:     // public API
 
diff --git a/include/wx/private/jsscriptwrapper.h b/include/wx/private/jsscriptwrapper.h
index e235ea46d3..7a904b1707 100644
--- a/include/wx/private/jsscriptwrapper.h
+++ b/include/wx/private/jsscriptwrapper.h
@@ -34,7 +34,7 @@ public:
         // Note that we use a different name for it for each call to
         // RunScript() (which creates a new wxJSScriptWrapper every time) to
         // avoid any possible conflict between different calls.
-        m_outputVarName = wxString::Format("__wxOut%i", (*runScriptCount)++);
+        m_outputVarName = wxString::Format(wxASCII_STR("__wxOut%i"), (*runScriptCount)++);
 
         // Adds one escape level.
         const char *charsNeededToBeEscaped = "\\\"\n\r\v\t\b\f";
@@ -79,8 +79,8 @@ public:
     {
         return wxString::Format
                (
-                "try { var %s = eval(\"%s\"); true; } "
-                "catch (e) { e.name + \": \" + e.message; }",
+                wxASCII_STR("try { var %s = eval(\"%s\"); true; } "
+                "catch (e) { e.name + \": \" + e.message; }"),
                 m_outputVarName,
                 m_escapedCode
                );
@@ -93,9 +93,9 @@ public:
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__)
         return wxString::Format
                (
-                "if (typeof %s == 'object') JSON.stringify(%s);"
+                wxASCII_STR("if (typeof %s == 'object') JSON.stringify(%s);"
                 "else if (typeof %s == 'undefined') 'undefined';"
-                "else %s;",
+                "else %s;"),
                 m_outputVarName,
                 m_outputVarName,
                 m_outputVarName,
@@ -104,7 +104,7 @@ public:
 #elif wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
         return wxString::Format
                (
-                "try {"
+                wxASCII_STR("try {"
                     "(%s == null || typeof %s != 'object') ? String(%s)"
                                                           ": JSON.stringify(%s);"
                 "}"
@@ -165,7 +165,7 @@ public:
                         "__wx$stringifyJSON(%s);"
                     "}"
                     "catch (e) { e.name + \": \" + e.message; }"
-                "}",
+                "}"),
                 m_outputVarName,
                 m_outputVarName,
                 m_outputVarName,
@@ -183,7 +183,7 @@ public:
     // we executed be garbage-collected.
     wxString GetCleanUpCode() const
     {
-        return wxString::Format("%s = undefined;", m_outputVarName);
+        return wxString::Format(wxASCII_STR("%s = undefined;"), m_outputVarName);
     }
 
 private:
diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h
index 40ba87eef0..241a50308a 100644
--- a/include/wx/private/wxprintf.h
+++ b/include/wx/private/wxprintf.h
@@ -855,10 +855,10 @@ struct wxPrintfConvSpecParser
                         wxFAIL_MSG
                         (
                             wxString::Format
-                            (
+                            (wxASCII_STR(
                                 "Format string \"%s\" uses both positional "
                                 "parameters and '*' but this is not currently "
-                                "supported by this implementation, sorry.",
+                                "supported by this implementation, sorry."),
                                 fmt
                             )
                         );
@@ -929,11 +929,11 @@ struct wxPrintfConvSpecParser
             wxFAIL_MSG
             (
                 wxString::Format
-                (
+                (wxASCII_STR(
                     "wxVsnprintf() currently supports only %d arguments, "
                     "but format string \"%s\" defines more of them.\n"
                     "You need to change wxMAX_SVNPRINTF_ARGUMENTS and "
-                    "recompile if more are really needed.",
+                    "recompile if more are really needed."),
                     fmt, wxMAX_SVNPRINTF_ARGUMENTS
                 )
             );
diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 1056e27d0e..b82f967516 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -400,11 +400,11 @@ class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,
-                   const wxString& title = wxGetTranslation("Print Preview"),
+                   const wxString& title = wxGetTranslation(wxASCII_STR("Print Preview")),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
-                   const wxString& name = wxFrameNameStr);
+                   const wxString& name = wxASCII_STR(wxFrameNameStr));
     virtual ~wxPreviewFrame();
 
     // Either Initialize() or InitializeWithModality() must be called before
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 2723bdb628..aaed57dd97 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -184,7 +184,7 @@ public:
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
                            long style = wxPGMAN_DEFAULT_STYLE,
-                           const wxString& name = wxPropertyGridManagerNameStr );
+                           const wxString& name = wxASCII_STR(wxPropertyGridManagerNameStr) );
 
     // Destructor.
     virtual ~wxPropertyGridManager();
@@ -228,7 +228,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxPGMAN_DEFAULT_STYLE,
-                 const wxString& name = wxPropertyGridManagerNameStr );
+                 const wxString& name = wxASCII_STR(wxPropertyGridManagerNameStr) );
 
     // Enables or disables (shows/hides) categories according to parameter
     // enable.
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index fced0e19d2..7a34b8f4f1 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -672,7 +672,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxPG_DEFAULT_STYLE,
-                    const wxString& name = wxPropertyGridNameStr );
+                    const wxString& name = wxASCII_STR(wxPropertyGridNameStr) );
 
     // Destructor
     virtual ~wxPropertyGrid();
@@ -741,7 +741,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxPG_DEFAULT_STYLE,
-                 const wxString& name = wxPropertyGridNameStr );
+                 const wxString& name = wxASCII_STR(wxPropertyGridNameStr) );
 
     // Call when editor widget's contents is modified.
     // For example, this is called when changes text in wxTextCtrl (used in
diff --git a/include/wx/protocol/log.h b/include/wx/protocol/log.h
index df373b928f..fa3481b718 100644
--- a/include/wx/protocol/log.h
+++ b/include/wx/protocol/log.h
@@ -32,12 +32,12 @@ public:
     // Called by wxProtocol-derived classes to actually log something
     virtual void LogRequest(const wxString& str)
     {
-        DoLogString("==> " + str);
+        DoLogString(wxASCII_STR("==> ") + str);
     }
 
     virtual void LogResponse(const wxString& str)
     {
-        DoLogString("<== " + str);
+        DoLogString(wxASCII_STR("<== ") + str);
     }
 
 protected:
diff --git a/include/wx/qt/bmpbuttn.h b/include/wx/qt/bmpbuttn.h
index 85f5afdecd..27f5a353a9 100644
--- a/include/wx/qt/bmpbuttn.h
+++ b/include/wx/qt/bmpbuttn.h
@@ -20,7 +20,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr);
+                   const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -29,7 +29,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 protected:
     wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 
diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h
index 3560267734..06cfb10876 100644
--- a/include/wx/qt/button.h
+++ b/include/wx/qt/button.h
@@ -20,14 +20,14 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
+           const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
+           const wxString& name = wxASCII_STR(wxButtonNameStr));
 
    virtual wxWindow *SetDefault() wxOVERRIDE;
 
diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h
index abdf32c31e..dde92af2a3 100644
--- a/include/wx/qt/calctrl.h
+++ b/include/wx/qt/calctrl.h
@@ -23,7 +23,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxCAL_SHOW_HOLIDAYS,
-                   const wxString& name = wxCalendarNameStr)
+                   const wxString& name = wxASCII_STR(wxCalendarNameStr))
     {
         Init();
         Create(parent, id, date, pos, size, style, name);
@@ -37,7 +37,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS,
-                const wxString& name = wxCalendarNameStr);
+                const wxString& name = wxASCII_STR(wxCalendarNameStr));
 
     virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
     virtual wxDateTime GetDate() const wxOVERRIDE;
diff --git a/include/wx/qt/checkbox.h b/include/wx/qt/checkbox.h
index ad59788c36..2f0500fed6 100644
--- a/include/wx/qt/checkbox.h
+++ b/include/wx/qt/checkbox.h
@@ -18,7 +18,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
+            const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -27,7 +27,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr );
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr) );
 
     virtual void SetValue(bool value) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
diff --git a/include/wx/qt/checklst.h b/include/wx/qt/checklst.h
index 243225acf1..a0bdbda805 100644
--- a/include/wx/qt/checklst.h
+++ b/include/wx/qt/checklst.h
@@ -19,14 +19,14 @@ public:
             const wxString *choices = (const wxString *)NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
     wxCheckListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
             const wxSize& size,
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
 
     virtual ~wxCheckListBox();
@@ -37,14 +37,14 @@ public:
                   int n = 0, const wxString choices[] = NULL,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = wxListBoxNameStr);
+                  const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                   const wxPoint& pos,
                   const wxSize& size,
                   const wxArrayString& choices,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = wxListBoxNameStr);
+                  const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual bool IsChecked(unsigned int item) const wxOVERRIDE;
     virtual void Check(unsigned int item, bool check = true) wxOVERRIDE;
diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h
index 5e8b1b7888..267d3410d9 100644
--- a/include/wx/qt/choice.h
+++ b/include/wx/qt/choice.h
@@ -21,7 +21,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     wxChoice( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
@@ -29,7 +29,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
@@ -37,7 +37,7 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
@@ -45,7 +45,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr );
+            const wxString& name = wxASCII_STR(wxChoiceNameStr) );
 
     virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
diff --git a/include/wx/qt/clrpicker.h b/include/wx/qt/clrpicker.h
index c3a9ea3096..d73c133ff7 100644
--- a/include/wx/qt/clrpicker.h
+++ b/include/wx/qt/clrpicker.h
@@ -30,7 +30,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = wxCLRBTN_DEFAULT_STYLE,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxColourPickerWidgetNameStr);
+                   const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -39,7 +39,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLRBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxColourPickerWidgetNameStr);
+                const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr));
 
 protected:
     virtual void UpdateColour() wxOVERRIDE;
diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h
index d0f60b6863..c8a596a251 100644
--- a/include/wx/qt/combobox.h
+++ b/include/wx/qt/combobox.h
@@ -24,7 +24,7 @@ public:
                int n = 0, const wxString choices[] = NULL,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr);
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     wxComboBox(wxWindow *parent, wxWindowID id,
                const wxString& value,
@@ -33,7 +33,7 @@ public:
                const wxArrayString& choices,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr);
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
@@ -42,7 +42,7 @@ public:
                 int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value,
                 const wxPoint& pos,
@@ -50,7 +50,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual void SetSelection(int n) wxOVERRIDE;
     virtual void SetSelection(long from, long to) wxOVERRIDE;
diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h
index 189a2b0932..38c45f43aa 100644
--- a/include/wx/qt/control.h
+++ b/include/wx/qt/control.h
@@ -16,13 +16,13 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr);
+             const wxString& name = wxASCII_STR(wxControlNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
     virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
diff --git a/include/wx/qt/dialog.h b/include/wx/qt/dialog.h
index 7a478bf9ff..e5a5572c82 100644
--- a/include/wx/qt/dialog.h
+++ b/include/wx/qt/dialog.h
@@ -20,7 +20,7 @@ public:
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
 
     virtual ~wxDialog();
 
@@ -29,7 +29,7 @@ public:
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString &name = wxDialogNameStr );
+            const wxString &name = wxASCII_STR(wxDialogNameStr) );
 
     virtual int ShowModal() wxOVERRIDE;
     virtual void EndModal(int retCode) wxOVERRIDE;
diff --git a/include/wx/qt/dirdlg.h b/include/wx/qt/dirdlg.h
index 17d8dfc8fb..7f47474d14 100644
--- a/include/wx/qt/dirdlg.h
+++ b/include/wx/qt/dirdlg.h
@@ -16,20 +16,20 @@ public:
     wxDirDialog() { }
 
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
     bool Create(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& message = wxASCII_STR(wxDirSelectorPromptStr),
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDirDialogNameStr));
 
 public:     // overrides from wxGenericDirDialog
 
diff --git a/include/wx/qt/filedlg.h b/include/wx/qt/filedlg.h
index 4c907aea83..cc48f71839 100644
--- a/include/wx/qt/filedlg.h
+++ b/include/wx/qt/filedlg.h
@@ -15,23 +15,23 @@ class WXDLLIMPEXP_CORE wxFileDialog : public wxFileDialogBase
 public:
     wxFileDialog() { }
     wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
     bool Create(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& message = wxASCII_STR(wxFileSelectorPromptStr),
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 const wxString& wildCard = wxASCII_STR(wxFileSelectorDefaultWildcardStr),
                  long style = wxFD_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
+                 const wxString& name = wxASCII_STR(wxFileDialogNameStr));
 
     virtual wxString GetPath() const wxOVERRIDE;
     virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h
index f640911a46..fa674d93b8 100644
--- a/include/wx/qt/frame.h
+++ b/include/wx/qt/frame.h
@@ -26,7 +26,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxDEFAULT_FRAME_STYLE,
-               const wxString& name = wxFrameNameStr)
+               const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE;
     virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE;
diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h
index a3e6d39db1..810bcea227 100644
--- a/include/wx/qt/gauge.h
+++ b/include/wx/qt/gauge.h
@@ -22,7 +22,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxGaugeNameStr);
+            const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -31,7 +31,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxGA_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
+                const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     virtual QWidget *GetHandle() const wxOVERRIDE;
 
diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h
index 3108bb62f8..2cdc98f29a 100644
--- a/include/wx/qt/listbox.h
+++ b/include/wx/qt/listbox.h
@@ -22,7 +22,7 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos,
@@ -30,7 +30,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
+            const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual ~wxListBox();
 
@@ -40,14 +40,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     virtual bool IsSelected(int n) const wxOVERRIDE;
     virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
diff --git a/include/wx/qt/listctrl.h b/include/wx/qt/listctrl.h
index 23a672dbf7..ae529b503a 100644
--- a/include/wx/qt/listctrl.h
+++ b/include/wx/qt/listctrl.h
@@ -27,7 +27,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxListCtrlNameStr);
+               const wxString& name = wxASCII_STR(wxListCtrlNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
@@ -35,7 +35,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxListCtrlNameStr));
 
     virtual ~wxListCtrl();
 
diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h
index 37448988a0..80756fdc0d 100644
--- a/include/wx/qt/mdi.h
+++ b/include/wx/qt/mdi.h
@@ -18,7 +18,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr);
+                     const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -26,7 +26,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // override/implement base class [pure] virtual methods
     // ----------------------------------------------------
@@ -54,7 +54,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr);
+                    const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     bool Create(wxMDIParentFrame *parent,
                 wxWindowID id,
@@ -62,7 +62,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual void Activate() wxOVERRIDE;
 
diff --git a/include/wx/qt/minifram.h b/include/wx/qt/minifram.h
index 0c10e5a634..c18b7edfe5 100644
--- a/include/wx/qt/minifram.h
+++ b/include/wx/qt/minifram.h
@@ -22,7 +22,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
-              const wxString& name = wxFrameNameStr)
+              const wxString& name = wxASCII_STR(wxFrameNameStr))
   {
       return wxFrame::Create(parent, id, title, pos, size,
                              style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR,
@@ -35,7 +35,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
-              const wxString& name = wxFrameNameStr)
+              const wxString& name = wxASCII_STR(wxFrameNameStr))
   {
       Create(parent, id, title, pos, size, style, name);
   }
diff --git a/include/wx/qt/msgdlg.h b/include/wx/qt/msgdlg.h
index 513d50a0d5..63e96464fe 100644
--- a/include/wx/qt/msgdlg.h
+++ b/include/wx/qt/msgdlg.h
@@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
+                    const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
     virtual ~wxMessageDialog();
diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h
index 7b580b0245..35e5db5ec8 100644
--- a/include/wx/qt/notebook.h
+++ b/include/wx/qt/notebook.h
@@ -19,14 +19,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNotebookNameStr);
+             const wxString& name = wxASCII_STR(wxNotebookNameStr));
 
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNotebookNameStr);
+              const wxString& name = wxASCII_STR(wxNotebookNameStr));
 
     virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
     virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h
index 43ca8284ba..1c56331666 100644
--- a/include/wx/qt/radiobox.h
+++ b/include/wx/qt/radiobox.h
@@ -26,7 +26,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr);
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
@@ -37,7 +37,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr);
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -48,7 +48,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -59,7 +59,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     using wxWindowBase::Show;
     using wxWindowBase::Enable;
diff --git a/include/wx/qt/radiobut.h b/include/wx/qt/radiobut.h
index 104d262e2d..5a1ab5ad14 100644
--- a/include/wx/qt/radiobut.h
+++ b/include/wx/qt/radiobut.h
@@ -21,7 +21,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxRadioButtonNameStr );
+                   const wxString& name = wxASCII_STR(wxRadioButtonNameStr) );
 
     bool Create( wxWindow *parent,
                  wxWindowID id,
@@ -30,7 +30,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxRadioButtonNameStr );
+                 const wxString& name = wxASCII_STR(wxRadioButtonNameStr) );
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h
index 87d7b7f90c..3f90caf087 100644
--- a/include/wx/qt/scrolbar.h
+++ b/include/wx/qt/scrolbar.h
@@ -23,14 +23,14 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr );
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) );
 
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr );
+           const wxString& name = wxASCII_STR(wxScrollBarNameStr) );
 
     virtual int GetThumbPosition() const wxOVERRIDE;
     virtual int GetThumbSize() const wxOVERRIDE;
diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h
index 823df0a0bc..5b6eeedaa1 100644
--- a/include/wx/qt/slider.h
+++ b/include/wx/qt/slider.h
@@ -21,7 +21,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr);
+             const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -30,7 +30,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     virtual int GetValue() const wxOVERRIDE;
     virtual void SetValue(int value) wxOVERRIDE;
diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h
index cf57a3aef4..d4210c5ff6 100644
--- a/include/wx/qt/statbmp.h
+++ b/include/wx/qt/statbmp.h
@@ -20,7 +20,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const wxString& name = wxStaticBitmapNameStr );
+                    const wxString& name = wxASCII_STR(wxStaticBitmapNameStr) );
 
     bool Create( wxWindow *parent,
                  wxWindowID id,
@@ -28,7 +28,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxStaticBitmapNameStr);
+                 const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
     virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
diff --git a/include/wx/qt/statbox.h b/include/wx/qt/statbox.h
index ab3dfdee01..bec283f6d0 100644
--- a/include/wx/qt/statbox.h
+++ b/include/wx/qt/statbox.h
@@ -20,14 +20,14 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
 
diff --git a/include/wx/qt/statline.h b/include/wx/qt/statline.h
index 728815a1f9..bab0b6bb09 100644
--- a/include/wx/qt/statline.h
+++ b/include/wx/qt/statline.h
@@ -20,14 +20,14 @@ public:
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticLineNameStr );
+                  const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
     bool Create( wxWindow *parent,
                  wxWindowID id = wxID_ANY,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
     virtual QWidget *GetHandle() const wxOVERRIDE;
 
diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h
index 5a19698191..c17202c85f 100644
--- a/include/wx/qt/stattext.h
+++ b/include/wx/qt/stattext.h
@@ -20,7 +20,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -28,7 +28,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
-                const wxString &name = wxStaticTextNameStr );
+                const wxString &name = wxASCII_STR(wxStaticTextNameStr) );
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
 
diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h
index eeb094746c..710bf4f768 100644
--- a/include/wx/qt/statusbar.h
+++ b/include/wx/qt/statusbar.h
@@ -21,11 +21,11 @@ public:
     wxStatusBar();
     wxStatusBar(wxWindow *parent, wxWindowID winid = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr);
+                const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr);
+                const wxString& name = wxASCII_STR(wxStatusBarNameStr));
 
     virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
     virtual void SetMinHeight(int height) wxOVERRIDE;
diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h
index b28fe0e5fe..48a2e1c8b4 100644
--- a/include/wx/qt/textctrl.h
+++ b/include/wx/qt/textctrl.h
@@ -22,7 +22,7 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxTextCtrlNameStr);
+               const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     virtual ~wxTextCtrl();
 
@@ -33,7 +33,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxTextCtrlNameStr);
+                const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     virtual int GetLineLength(long lineNo) const wxOVERRIDE;
     virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index 2bb47042ae..3d1d7a64d0 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -22,7 +22,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr);
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -30,7 +30,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     virtual void SetValue(bool state) wxOVERRIDE;
     virtual bool GetValue() const wxOVERRIDE;
@@ -56,7 +56,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr);
+                   const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -64,7 +64,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
 
 private:
diff --git a/include/wx/qt/toolbar.h b/include/wx/qt/toolbar.h
index 6b3c38e42a..7ae8a8af4a 100644
--- a/include/wx/qt/toolbar.h
+++ b/include/wx/qt/toolbar.h
@@ -22,7 +22,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
-              const wxString& name = wxToolBarNameStr)
+              const wxString& name = wxASCII_STR(wxToolBarNameStr))
     {
         Init();
 
@@ -36,7 +36,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
-                const wxString& name = wxToolBarNameStr);
+                const wxString& name = wxASCII_STR(wxToolBarNameStr));
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
 
diff --git a/include/wx/qt/toplevel.h b/include/wx/qt/toplevel.h
index 8e5f7f6208..32fb5802e5 100644
--- a/include/wx/qt/toplevel.h
+++ b/include/wx/qt/toplevel.h
@@ -19,7 +19,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxDEFAULT_FRAME_STYLE,
-               const wxString& name = wxFrameNameStr);
+               const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -27,7 +27,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual bool Show(bool show = true) wxOVERRIDE;
     virtual void Maximize(bool maximize = true) wxOVERRIDE;
diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h
index 3db3838f7d..473f2c1f09 100644
--- a/include/wx/qt/treectrl.h
+++ b/include/wx/qt/treectrl.h
@@ -19,7 +19,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTreeCtrlNameStr);
+               const wxString& name = wxASCII_STR(wxTreeCtrlNameStr));
 
     virtual ~wxTreeCtrl();
 
@@ -28,7 +28,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTreeCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTreeCtrlNameStr));
 
     virtual unsigned int GetCount() const wxOVERRIDE;
 
diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index ea29c549a5..a426af9f67 100644
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -64,14 +64,14 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     bool Create(wxWindowQt *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // Used by all window classes in the widget creation process.
     void PostCreation( bool generic = true );
diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index 06d8e58968..5e2f5f9977 100644
--- a/include/wx/rearrangectrl.h
+++ b/include/wx/rearrangectrl.h
@@ -60,7 +60,7 @@ public:
                     const wxArrayString& items,
                     long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxRearrangeListNameStr)
+                    const wxString& name = wxASCII_STR(wxRearrangeListNameStr))
     {
         Create(parent, id, pos, size, order, items, style, validator, name);
     }
@@ -75,7 +75,7 @@ public:
                 const wxArrayString& items,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRearrangeListNameStr);
+                const wxString& name = wxASCII_STR(wxRearrangeListNameStr));
 
 
     // items order
@@ -141,7 +141,7 @@ public:
                     const wxArrayString& items,
                     long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxRearrangeListNameStr)
+                    const wxString& name = wxASCII_STR(wxRearrangeListNameStr))
     {
         Init();
 
@@ -156,7 +156,7 @@ public:
                 const wxArrayString& items,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRearrangeListNameStr);
+                const wxString& name = wxASCII_STR(wxRearrangeListNameStr));
 
     // get the underlying listbox
     wxRearrangeList *GetList() const { return m_list; }
@@ -195,7 +195,7 @@ public:
                       const wxArrayInt& order,
                       const wxArrayString& items,
                       const wxPoint& pos = wxDefaultPosition,
-                      const wxString& name = wxRearrangeDialogNameStr)
+                      const wxString& name = wxASCII_STR(wxRearrangeDialogNameStr))
     {
         Init();
 
@@ -208,7 +208,7 @@ public:
                 const wxArrayInt& order,
                 const wxArrayString& items,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxString& name = wxRearrangeDialogNameStr);
+                const wxString& name = wxASCII_STR(wxRearrangeDialogNameStr));
 
 
     // methods for the dialog customization
diff --git a/include/wx/ribbon/control.h b/include/wx/ribbon/control.h
index 120ae7dee0..4fd3e50509 100644
--- a/include/wx/ribbon/control.h
+++ b/include/wx/ribbon/control.h
@@ -30,7 +30,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxControlNameStr)
+                    const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Init();
 
@@ -41,7 +41,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
+            const wxString& name = wxASCII_STR(wxControlNameStr));
 
     virtual void SetArtProvider(wxRibbonArtProvider* art);
     wxRibbonArtProvider* GetArtProvider() const {return m_art;}
diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h
index 53812e0e6d..817d6c3fdb 100644
--- a/include/wx/richmsgdlg.h
+++ b/include/wx/richmsgdlg.h
@@ -86,7 +86,7 @@ private:
     public:
         wxRichMessageDialog( wxWindow *parent,
                              const wxString& message,
-                             const wxString& caption = wxMessageBoxCaptionStr,
+                             const wxString& caption = wxASCII_STR(wxMessageBoxCaptionStr),
                              long style = wxOK | wxCENTRE )
             : wxGenericRichMessageDialog( parent, message, caption, style )
             { }
diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index 075f10df2a..5701f6da43 100644
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -251,7 +251,7 @@ public:
         @see Create(), wxValidator
     */
     wxRichTextCtrl( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr);
+        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxTextCtrlNameStr));
 
     /**
         Destructor.
@@ -264,7 +264,7 @@ public:
         Creates the underlying window.
     */
     bool Create( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr );
+        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxTextCtrlNameStr) );
 
     /**
         Initialises the members of the control.
diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index 26444d0cd9..cf45582cd5 100644
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
  */
 
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE wxGetTranslation("Style Organiser")
+#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE wxGetTranslation(wxASCII_STR("Style Organiser"))
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME ID_RICHTEXTSTYLEORGANISERDIALOG
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION wxDefaultPosition
diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 8c966545df..0096e51361 100644
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -205,7 +205,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxPanelNameStr)
+               const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
 
@@ -221,7 +221,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // dtor does some internal cleanup
     virtual ~wxSymbolListCtrl();
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 7ab55524b0..9bd54be58a 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -38,7 +38,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
+                const wxString& name = wxASCII_STR(wxScrollBarNameStr));
     */
 
     // accessors
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index bc3c90723c..f4ac9b802f 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -432,7 +432,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxScrolledWindowStyle,
-               const wxString& name = wxPanelNameStr)
+               const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxScrollHelper(this)
     {
         Create(parent, winid, pos, size, style, name);
@@ -443,7 +443,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         m_targetWindow = this;
 
@@ -500,7 +500,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
-                     const wxString& name = wxPanelNameStr)
+                     const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxScrolled<wxPanel>(parent, winid, pos, size, style, name) {}
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow);
diff --git a/include/wx/testing.h b/include/wx/testing.h
index 6f55d106ee..f97ed66793 100644
--- a/include/wx/testing.h
+++ b/include/wx/testing.h
@@ -51,7 +51,8 @@ wxGetDialogClassDescription(const wxClassInfo *ci, const std::type_info& ti)
     // than a readable but useless "wxDialog".
     if ( ci == wxCLASSINFO(wxDialog) )
     {
-        return wxString::Format("dialog of type \"%s\"", ti.name());
+        return wxString::Format(wxASCII_STR("dialog of type \"%s\""),
+                                wxASCII_STR(ti.name()));
     }
 
     // We consider that an unmangled name is clear enough to be used on its own.
@@ -247,23 +248,23 @@ protected:
         {
             case wxID_YES:
             case wxID_NO:
-                details = "wxYES_NO style";
+                details = wxASCII_STR("wxYES_NO style");
                 break;
 
             case wxID_CANCEL:
-                details = "wxCANCEL style";
+                details = wxASCII_STR("wxCANCEL style");
                 break;
 
             case wxID_OK:
-                details = "wxOK style";
+                details = wxASCII_STR("wxOK style");
                 break;
 
             default:
-                details.Printf("a button with ID=%d", m_id);
+                details.Printf(wxASCII_STR("a button with ID=%d"), m_id);
                 break;
         }
 
-        return "wxMessageDialog with " + details;
+        return wxASCII_STR("wxMessageDialog with ") + details;
     }
 };
 
@@ -336,7 +337,7 @@ public:
             (
                 wxString::Format
                 (
-                    "Expected %s was not shown.",
+                    wxASCII_STR("Expected %s was not shown."),
                     expect->GetDescription()
                 )
             );
@@ -369,7 +370,7 @@ protected:
                 (
                     wxString::Format
                     (
-                        "%s was shown unexpectedly, expected %s.",
+                        wxASCII_STR("%s was shown unexpectedly, expected %s."),
                         DescribeUnexpectedDialog(dlg),
                         expect->GetDescription()
                     )
@@ -383,7 +384,7 @@ protected:
         (
             wxString::Format
             (
-                "%s was shown unexpectedly.",
+                wxASCII_STR("%s was shown unexpectedly."),
                 DescribeUnexpectedDialog(dlg)
             )
         );
@@ -402,14 +403,14 @@ protected:
         {
             return wxString::Format
                    (
-                        "A message box \"%s\"",
+                        wxASCII_STR("A message box \"%s\""),
                         msgdlg->GetMessage()
                    );
         }
 
         return wxString::Format
                (
-                    "A %s with title \"%s\"",
+                    wxASCII_STR("A %s with title \"%s\""),
                     wxGetDialogClassDescription(dlg->GetClassInfo(), typeid(*dlg)),
                     dlg->GetTitle()
                );
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 0089481189..5632aff027 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -394,7 +394,7 @@ protected:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
+                   const wxString& name = wxASCII_STR(wxFrameNameStr))
             : wxTopLevelWindowNative(parent, winid, title,
                                      pos, size, style, name)
         {
diff --git a/include/wx/translation.h b/include/wx/translation.h
index df43a6def8..88a7ba6430 100644
--- a/include/wx/translation.h
+++ b/include/wx/translation.h
@@ -35,7 +35,11 @@
 // --keyword="_" --keyword="wxPLURAL:1,2" options
 // to extract the strings from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     #define _(s)                               wxGetTranslation((s))
+#else
+    #define _(s)                               wxGetTranslation(wxASCII_STR(s))
+#endif
     #define wxPLURAL(sing, plur, n)            wxGetTranslation((sing), (plur), n)
 #endif
 
@@ -43,8 +47,13 @@
 // them, you need to also add
 // --keyword="wxGETTEXT_IN_CONTEXT:1c,2" --keyword="wxGETTEXT_IN_CONTEXT_PLURAL:1c,2,3"
 // options to xgettext invocation.
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
 #define wxGETTEXT_IN_CONTEXT(c, s) \
     wxGetTranslation((s), wxString(), c)
+#else
+#define wxGETTEXT_IN_CONTEXT(c, s) \
+    wxGetTranslation(wxASCII_STR(s), wxString(), c)
+#endif
 #define wxGETTEXT_IN_CONTEXT_PLURAL(c, sing, plur, n) \
     wxGetTranslation((sing), (plur), n, wxString(), c)
 
@@ -143,7 +152,7 @@ public:
     // find best translation language for given domain
     wxString GetBestTranslation(const wxString& domain, wxLanguage msgIdLanguage);
     wxString GetBestTranslation(const wxString& domain,
-                                const wxString& msgIdLanguage = "en");
+                                const wxString& msgIdLanguage = wxASCII_STR("en"));
 
     // add standard wxWidgets catalog ("wxstd")
     bool AddStdCatalog();
@@ -244,7 +253,7 @@ public:
 
 protected:
     // returns resource type to use for translations
-    virtual wxString GetResourceType() const { return "MOFILE"; }
+    virtual wxString GetResourceType() const { return wxASCII_STR("MOFILE"); }
 
     // returns module to load resources from
     virtual WXHINSTANCE GetModule() const { return NULL; }
@@ -297,7 +306,11 @@ inline const wxString& wxGetTranslation(const wxString& str1,
 
 #if !defined(WXINTL_NO_GETTEXT_MACRO)
     #if !defined(_)
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
         #define _(s)                 (s)
+#else
+        #define _(s)                 wxASCII_STR(s)
+#endif
     #endif
     #define wxPLURAL(sing, plur, n)  ((n) == 1 ? (sing) : (plur))
     #define wxGETTEXT_IN_CONTEXT(c, s)                     (s)
diff --git a/include/wx/treelist.h b/include/wx/treelist.h
index 68d15ca733..5680c31547 100644
--- a/include/wx/treelist.h
+++ b/include/wx/treelist.h
@@ -131,7 +131,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxTL_DEFAULT_STYLE,
-                   const wxString& name = wxTreeListCtrlNameStr)
+                   const wxString& name = wxASCII_STR(wxTreeListCtrlNameStr))
     {
         Init();
 
@@ -143,7 +143,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTL_DEFAULT_STYLE,
-                const wxString& name = wxTreeListCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTreeListCtrlNameStr));
 
 
     virtual ~wxTreeListCtrl();
diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index ebb3a619e7..6c37b78193 100644
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -23,7 +23,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
+                   const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
@@ -35,7 +35,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual void SetMargins(int x, int y) wxOVERRIDE
     {
diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index 16a58b1d7c..14684580da 100644
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -38,7 +38,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
+             const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Init();
 
@@ -52,7 +52,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
+             const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         Init();
 
@@ -66,7 +66,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr)
+                const wxString& name = wxASCII_STR(wxButtonNameStr))
     {
         return Create(parent, id, wxNullBitmap, label,
                       pos, size, style, validator, name);
@@ -80,7 +80,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
+                const wxString& name = wxASCII_STR(wxButtonNameStr));
 
     virtual ~wxButton();
 
diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 8e4a8fa028..f1b4c79bb2 100644
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -58,7 +58,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxCheckBoxNameStr)
+               const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
     {
         Init();
 
@@ -72,7 +72,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // implement the checkbox interface
     virtual void SetValue(bool value) wxOVERRIDE;
diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 7b20f37eee..f93be1eaa7 100644
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -35,7 +35,7 @@ public:
                    const wxString choices[] = NULL,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr))
     {
         Init();
 
@@ -48,7 +48,7 @@ public:
                    const wxArrayString& choices,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
+                   const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -58,7 +58,7 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos,
@@ -66,7 +66,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // implement check list box methods
     virtual bool IsChecked(unsigned int item) const wxOVERRIDE;
diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index b1b5f90337..512e317e3d 100644
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -25,7 +25,7 @@ public:
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
+            const wxString& name = wxASCII_STR(wxChoiceNameStr))
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
@@ -35,7 +35,7 @@ public:
             const wxArrayString& choices,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
+            const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -43,14 +43,14 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
+                const wxString& name = wxASCII_STR(wxChoiceNameStr));
 
 private:
     void OnComboBox(wxCommandEvent &event);
diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 2eff8cfb6c..22a7f1665f 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -49,7 +49,7 @@ public:
                const wxString choices[] = (const wxString *) NULL,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr)
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr))
     {
         Init();
 
@@ -64,7 +64,7 @@ public:
                const wxArrayString& choices,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr);
+               const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -75,7 +75,7 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& value,
@@ -84,7 +84,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
+                const wxString& name = wxASCII_STR(wxComboBoxNameStr));
 
     virtual ~wxComboBox();
 
diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h
index f6e228c51b..8a623da0ed 100644
--- a/include/wx/univ/control.h
+++ b/include/wx/univ/control.h
@@ -47,7 +47,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,
               const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxControlNameStr)
+              const wxString& name = wxASCII_STR(wxControlNameStr))
     {
         Init();
 
@@ -59,7 +59,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxControlNameStr);
+                const wxString& name = wxASCII_STR(wxControlNameStr));
 
     // this function will filter out '&' characters and will put the
     // accelerator char (the one immediately after '&') into m_chAccel
diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index d73f8e5dc5..fa79b88ff4 100644
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -26,7 +26,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
+             const wxString& name = wxASCII_STR(wxDialogNameStr))
     {
         Init();
         Create(parent, id, title, pos, size, style, name);
@@ -37,7 +37,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
+                const wxString& name = wxASCII_STR(wxDialogNameStr));
 
     virtual ~wxDialog();
 
diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 2ba413bdc3..823e2d967d 100644
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -25,7 +25,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+            const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Create(parent, id, title, pos, size, style, name);
     }
@@ -36,7 +36,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
     virtual bool Enable(bool enable = true) wxOVERRIDE;
@@ -45,14 +45,14 @@ public:
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxSTB_DEFAULT_STYLE,
                                          wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
+                                         const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE;
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr) wxOVERRIDE;
+                                     const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE;
 #endif // wxUSE_TOOLBAR
 
     virtual wxSize GetMinSize() const wxOVERRIDE;
diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h
index 2784368a4e..a92ca332e4 100644
--- a/include/wx/univ/gauge.h
+++ b/include/wx/univ/gauge.h
@@ -27,7 +27,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxGaugeNameStr)
+            const wxString& name = wxASCII_STR(wxGaugeNameStr))
     {
         Init();
 
@@ -41,7 +41,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxGA_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
+                const wxString& name = wxASCII_STR(wxGaugeNameStr));
 
     // implement base class virtuals
     virtual void SetRange(int range) wxOVERRIDE;
diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index a3834cb82c..cbd2819bbe 100644
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -59,7 +59,7 @@ public:
               int n = 0, const wxString choices[] = (const wxString *) NULL,
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxListBoxNameStr )
+              const wxString& name = wxASCII_STR(wxListBoxNameStr) )
         : wxScrollHelper(this)
     {
         Init();
@@ -73,7 +73,7 @@ public:
               const wxArrayString& choices,
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxListBoxNameStr );
+              const wxString& name = wxASCII_STR(wxListBoxNameStr) );
 
     virtual ~wxListBox();
 
@@ -84,7 +84,7 @@ public:
                 int n = 0, const wxString choices[] = (const wxString *) NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos,
@@ -92,7 +92,7 @@ public:
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxListBoxNameStr));
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void DoClear() wxOVERRIDE;
diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 0a2f8f7f95..f487118206 100644
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -41,7 +41,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxNotebookNameStr)
+               const wxString& name = wxASCII_STR(wxNotebookNameStr))
     {
         Init();
 
@@ -54,7 +54,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxNotebookNameStr);
+                const wxString& name = wxASCII_STR(wxNotebookNameStr));
 
     // dtor
     virtual ~wxNotebook();
diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h
index 626a6c3577..175c26bb91 100644
--- a/include/wx/univ/panel.h
+++ b/include/wx/univ/panel.h
@@ -24,7 +24,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
+            const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Create(parent, winid, pos, size, style, name);
     }
@@ -36,7 +36,7 @@ public:
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
             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);
     }
diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 7c1a7d9750..db67828f00 100644
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -38,7 +38,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr))
     {
         Init();
 
@@ -54,7 +54,7 @@ public:
                int majorDim = 0,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr);
+               const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -65,7 +65,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -75,7 +75,7 @@ public:
                 int majorDim = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
+                const wxString& name = wxASCII_STR(wxRadioBoxNameStr));
 
     virtual ~wxRadioBox();
 
diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index ba5eb9a702..ae16aa25ce 100644
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -30,7 +30,7 @@ public:
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = wxRadioButtonNameStr)
+                  const wxString& name = wxASCII_STR(wxRadioButtonNameStr))
     {
         Init();
 
@@ -44,7 +44,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRadioButtonNameStr);
+                const wxString& name = wxASCII_STR(wxRadioButtonNameStr));
 
     // override some base class methods
     virtual void ChangeValue(bool value) wxOVERRIDE;
diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 7b15bc1be8..acc1d3a1cb 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -62,7 +62,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
+                const wxString& name = wxASCII_STR(wxScrollBarNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -70,7 +70,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
+                const wxString& name = wxASCII_STR(wxScrollBarNameStr));
 
     virtual ~wxScrollBar();
 
diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index f6384faf4f..1bc6c181bd 100644
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -49,7 +49,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr);
+             const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -58,7 +58,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSL_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
+                const wxString& name = wxASCII_STR(wxSliderNameStr));
 
     // implement base class pure virtuals
     virtual int GetValue() const wxOVERRIDE;
diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 0515a4fed8..38d8a545d6 100644
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -39,7 +39,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = wxStaticBitmapNameStr)
+                   const wxString& name = wxASCII_STR(wxStaticBitmapNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -50,7 +50,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
 
     virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
     virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index ac6d8e8365..6e54afb793 100644
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -29,7 +29,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr)
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -40,7 +40,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
+                const wxString& name = wxASCII_STR(wxStaticBoxNameStr));
 
     // the origin of the static box is inside the border and under the label:
     // take account of this
diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index 63d3a096c2..e67e43bbce 100644
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -32,7 +32,7 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr )
+                 const wxString &name = wxASCII_STR(wxStaticLineNameStr) )
     {
         Create(parent, id, pos, size, style, name);
     }
@@ -42,7 +42,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticLineNameStr );
+                const wxString &name = wxASCII_STR(wxStaticLineNameStr) );
 
 protected:
     virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 54a0284c58..72e038b9e9 100644
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -24,7 +24,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {
-        Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr);
+        Create(parent, wxID_ANY, label, pos, size, 0, wxASCII_STR(wxStaticTextNameStr));
     }
 
     // full form
@@ -34,7 +34,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticTextNameStr)
+                 const wxString &name = wxASCII_STR(wxStaticTextNameStr))
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -46,7 +46,7 @@ public:
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
-                const wxString &name = wxStaticTextNameStr);
+                const wxString &name = wxASCII_STR(wxStaticTextNameStr));
 
     // implementation only from now on
 
diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index fe39b05f38..a5f05bab25 100644
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -26,7 +26,7 @@ public:
     wxStatusBarUniv(wxWindow *parent,
                     wxWindowID id = wxID_ANY,
                     long style = wxSTB_DEFAULT_STYLE,
-                    const wxString& name = wxPanelNameStr)
+                    const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
 
@@ -36,7 +36,7 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     // implement base class methods
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE;
diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 0aa40a437d..3a15244a8b 100644
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -81,7 +81,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTextCtrlNameStr)
+               const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
         : wxScrollHelper(this)
     {
         Init();
@@ -96,7 +96,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxTextCtrlNameStr));
 
     virtual ~wxTextCtrl();
 
diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 21ef58f22a..a49adefea7 100644
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -27,7 +27,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxCheckBoxNameStr);
+             const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     // Create the control
     bool Create(wxWindow *parent,
@@ -37,7 +37,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
+                const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
 
     virtual bool IsPressed() const wxOVERRIDE { return m_isPressed || m_value; }
 
diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index b393311e60..22ab99dd1c 100644
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -40,7 +40,7 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxToolBarNameStr)
+              const wxString& name = wxASCII_STR(wxToolBarNameStr))
     {
         Init();
 
@@ -52,7 +52,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxToolBarNameStr );
+                 const wxString& name = wxASCII_STR(wxToolBarNameStr) );
 
     virtual ~wxToolBar();
 
diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 94e1edf9ca..e2e8efc43e 100644
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -99,7 +99,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE,
-                     const wxString& name = wxFrameNameStr)
+                     const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -112,7 +112,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     // wxUniv-specific methods: do [not] use native decorations for this (or
     // all) window(s)
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index f60ab83e27..b615c2a04f 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -62,7 +62,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxPanelNameStr)
+             const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
         { Init(); }
 
@@ -71,7 +71,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     virtual ~wxWindow();
 
diff --git a/include/wx/unix/private/fswatcher_kqueue.h b/include/wx/unix/private/fswatcher_kqueue.h
index de3d489a38..940fda2cc2 100644
--- a/include/wx/unix/private/fswatcher_kqueue.h
+++ b/include/wx/unix/private/fswatcher_kqueue.h
@@ -34,7 +34,7 @@ public:
 
             wxDir dir(winfo.GetPath());
             wxCHECK_RET( dir.IsOpened(),
-                  wxString::Format("Unable to open dir '%s'", winfo.GetPath()));
+                  wxString::Format(wxASCII_STR("Unable to open dir '%s'"), winfo.GetPath()));
 
             wxString filename;
             bool ret = dir.GetFirst(&filename);
diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 2bee9267a1..b7b149ead6 100644
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -15,6 +15,7 @@
 #include "wx/bitmap.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
+
 extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[];
 
 // ----------------------------------------------------------------------------
@@ -45,7 +46,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxVListBoxNameStr)
+               const wxString& name = wxASCII_STR(wxVListBoxNameStr))
     {
         Init();
 
@@ -63,7 +64,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxVListBoxNameStr);
+                const wxString& name = wxASCII_STR(wxVListBoxNameStr));
 
     // dtor does some internal cleanup (deletes m_selStore if any)
     virtual ~wxVListBox();
diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 97f8edf17f..9ff74544a8 100644
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -694,7 +694,7 @@ public:
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
-                      const wxString& name = wxPanelNameStr)
+                      const wxString& name = wxASCII_STR(wxPanelNameStr))
     : wxVarVScrollLegacyAdaptor(this)
     {
         (void)Create(parent, id, pos, size, style, name);
@@ -709,7 +709,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         return wxPanel::Create(parent, id, pos, size, style | wxVSCROLL, name);
     }
@@ -770,7 +770,7 @@ public:
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
-                      const wxString& name = wxPanelNameStr)
+                      const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxVarHScrollHelper(this)
     {
         (void)Create(parent, id, pos, size, style, name);
@@ -785,7 +785,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         return wxPanel::Create(parent, id, pos, size, style | wxHSCROLL, name);
     }
@@ -833,7 +833,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
-                       const wxString& name = wxPanelNameStr)
+                       const wxString& name = wxASCII_STR(wxPanelNameStr))
         : wxPanel(),
           wxVarHVScrollHelper(this)
     {
@@ -849,7 +849,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
+                const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         return wxPanel::Create(parent, id, pos, size,
                                style | wxVSCROLL | wxHSCROLL, name);
diff --git a/include/wx/webview.h b/include/wx/webview.h
index da045589b4..5fb30dc352 100644
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -110,11 +110,11 @@ public:
     virtual wxWebView* Create() = 0;
     virtual wxWebView* Create(wxWindow* parent,
                               wxWindowID id,
-                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxString& url = wxASCII_STR(wxWebViewDefaultURLStr),
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
                               long style = 0,
-                              const wxString& name = wxWebViewNameStr) = 0;
+                              const wxString& name = wxASCII_STR(wxWebViewNameStr)) = 0;
 };
 
 WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewFactory>, wxStringWebViewFactoryMap);
@@ -132,23 +132,23 @@ public:
 
     virtual bool Create(wxWindow* parent,
            wxWindowID id,
-           const wxString& url = wxWebViewDefaultURLStr,
+           const wxString& url = wxASCII_STR(wxWebViewDefaultURLStr),
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
-           const wxString& name = wxWebViewNameStr) = 0;
+           const wxString& name = wxASCII_STR(wxWebViewNameStr)) = 0;
 
     // Factory methods allowing the use of custom factories registered with
     // RegisterFactory
-    static wxWebView* New(const wxString& backend = wxWebViewBackendDefault);
+    static wxWebView* New(const wxString& backend = wxASCII_STR(wxWebViewBackendDefault));
     static wxWebView* New(wxWindow* parent,
                           wxWindowID id,
-                          const wxString& url = wxWebViewDefaultURLStr,
+                          const wxString& url = wxASCII_STR(wxWebViewDefaultURLStr),
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
-                          const wxString& backend = wxWebViewBackendDefault,
+                          const wxString& backend = wxASCII_STR(wxWebViewBackendDefault),
                           long style = 0,
-                          const wxString& name = wxWebViewNameStr);
+                          const wxString& name = wxASCII_STR(wxWebViewNameStr));
 
     static void RegisterFactory(const wxString& backend,
                                 wxSharedPtr<wxWebViewFactory> factory);
diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index c2be68c006..7fea3d714f 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -186,7 +186,7 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
-    wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");
+    wxFFileInputStream(const wxString& fileName, const wxString& mode = wxASCII_STR("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();
@@ -216,7 +216,7 @@ protected:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
-    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb");
+    wxFFileOutputStream(const wxString& fileName, const wxString& mode = wxASCII_STR("wb"));
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
@@ -249,7 +249,7 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
                                        public wxFFileOutputStream
 {
 public:
-    wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
+    wxFFileStream(const wxString& fileName, const wxString& mode = wxASCII_STR("w+b"));
 
     // override some virtual functions to resolve ambiguities, just as in
     // wxFileStream
diff --git a/include/wx/window.h b/include/wx/window.h
index e574fe9df2..7b197b2fcc 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1603,7 +1603,7 @@ protected:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxPanelNameStr);
+                    const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     bool CreateBase(wxWindowBase *parent,
                     wxWindowID winid,
diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h
index db88eea5a3..3e120dd177 100644
--- a/include/wx/x11/minifram.h
+++ b/include/wx/x11/minifram.h
@@ -27,7 +27,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
-        const wxString& name = wxFrameNameStr)
+        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         // Use wxFrame constructor in absence of more specific code.
         Create(parent, id, title, pos, size, style, name);
diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 6d3a8e6e40..b624964a04 100644
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -94,7 +94,7 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxTextCtrlNameStr);
+               const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
     virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
@@ -104,7 +104,7 @@ public:
                 const wxSize &size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxTextCtrlNameStr);
+                const wxString &name = wxASCII_STR(wxTextCtrlNameStr));
 
     // required for scrolling with wxScrollHelper
     // ------------------------------------------
diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 0eec73778b..9f74c2de3a 100644
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -27,7 +27,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
+                        const wxString& name = wxASCII_STR(wxFrameNameStr))
     {
         Init();
 
@@ -40,7 +40,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+                const wxString& name = wxASCII_STR(wxFrameNameStr));
 
     virtual ~wxTopLevelWindowX11();
 
diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index bfe6b3ffb7..8c46554fb0 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -30,7 +30,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxPanelNameStr)
+        const wxString& name = wxASCII_STR(wxPanelNameStr))
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -43,7 +43,7 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
-        const wxString& name = wxPanelNameStr);
+        const wxString& name = wxASCII_STR(wxPanelNameStr));
 
     virtual void Raise();
     virtual void Lower();
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 9b74828fc2..8b4710b676 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -250,7 +250,7 @@ public:
     // wxWindow::NewControlId(). Otherwise value_if_not_found is used.
     // Macro XRCID(name) is provided for convenient use in event tables.
     static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE)
-        { return DoGetXRCID(str_id.mb_str(), value_if_not_found); }
+        { return DoGetXRCID(str_id.utf8_str(), value_if_not_found); }
 
     // version for internal use only
     static int DoGetXRCID(const char *str_id, int value_if_not_found = wxID_NONE);
diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index e9b464bb87..e6c3467cbd 100644
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -28,7 +28,7 @@
 #include "artbrows.h"
 
 #define ART_CLIENT(id) \
-    choice->Append(#id, const_cast<void*>(static_cast<const void*>(id)));
+    choice->Append(#id, new wxStringClientData(id));
 #define ART_ICON(id) \
     { \
         int ind; \
@@ -38,7 +38,7 @@
         else \
             ind = 0; \
         list->InsertItem(index, #id, ind); \
-        list->SetItemPtrData(index, wxPtrToUInt(id)); \
+        list->SetItemPtrData(index, wxPtrToUInt(new wxString(id))); \
         index++; \
     }
 
@@ -227,9 +227,9 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 
 void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
 {
-    const char *data = (const char*)event.GetData();
-    m_currentArtId = wxString( data );
-    SetArtBitmap(data, m_client, GetSelectedBitmapSize());
+    const wxString *data = (const wxString*)event.GetData();
+    m_currentArtId = *data;
+    SetArtBitmap(*data, m_client, GetSelectedBitmapSize());
 }
 
 void wxArtBrowserDialog::OnChangeSize(wxCommandEvent& WXUNUSED(event))
@@ -239,8 +239,8 @@ void wxArtBrowserDialog::OnChangeSize(wxCommandEvent& WXUNUSED(event))
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
 {
-    const char *data = (const char*)event.GetClientData();
-    SetArtClient(data);
+    wxStringClientData *data = (wxStringClientData *)event.GetClientObject();
+    SetArtClient(data->GetData());
 }
 
 void wxArtBrowserDialog::SetArtBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp
index b8a43a4039..4bfdda799e 100644
--- a/samples/treelist/treelist.cpp
+++ b/samples/treelist/treelist.cpp
@@ -373,7 +373,7 @@ void MyFrame::InitImageList()
     m_imageList = new wxImageList(iconSize.x, iconSize.y);
 
     // The order should be the same as for the enum elements.
-    static const char* const icons[] =
+    static const wxString icons[] =
     {
         wxART_NORMAL_FILE,
         wxART_FOLDER,
diff --git a/src/common/arttango.cpp b/src/common/arttango.cpp
index 94db4628da..cbe4e932ff 100644
--- a/src/common/arttango.cpp
+++ b/src/common/arttango.cpp
@@ -129,7 +129,7 @@ wxTangoArtProvider::CreateBitmap(const wxArtID& id,
 
     static const struct BitmapEntry
     {
-        const char *id;
+        wxString id;
         const unsigned char *data16;
         size_t len16;
         const unsigned char *data24;
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 36c832d389..e3cc635aac 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -808,7 +808,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
-    static const char* const icons[] =
+    static wxString const icons[] =
     {
         wxART_ERROR,
         wxART_WARNING,
diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index b5fa77f9af..c4ecdd8b1c 100644
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -58,7 +58,7 @@ namespace
     #define ART(wxId, stockId, unused) wxId, stockId,
 #endif
 
-const char* const wxId2Gtk[] = {
+const wxString wxId2Gtk[] = {
     ART(wxART_ERROR,            GTK_STOCK_DIALOG_ERROR, "dialog-error")
     ART(wxART_INFORMATION,      GTK_STOCK_DIALOG_INFO, "dialog-information")
     ART(wxART_WARNING,          GTK_STOCK_DIALOG_WARNING, "dialog-warning")
@@ -137,7 +137,7 @@ wxString wxArtIDToStock(const wxArtID& id)
     {
         if (id == wxId2Gtk[i])
         {
-            ret = wxString::FromAscii(wxId2Gtk[i + 1]);
+            ret = wxId2Gtk[i + 1];
             break;
         }
     }
diff --git a/tests/testprec.h b/tests/testprec.h
index 4f9068994a..57dfe5d17e 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -73,7 +73,7 @@ struct StringMaker<wchar_t>
         if ( wc < 0x7f )
             return std::string(static_cast<char>(wc), 1);
 
-        return wxString::Format("U+%06X", wc).ToStdString();
+        return wxString::Format(wxASCII_STR("U+%06X"), wc).ToStdString(wxConvLibc);
     }
 };