remove usage of wxT() macro; it makes example code a bit harder to read

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/access.h b/interface/wx/access.h
index 5a540f59645d0e8dc2fd750bb4beae77b931ef29..10cb58bcfeff8c861348e4ddd3e0491be94ceb3a 100644 (file)
--- a/interface/wx/access.h
+++ b/interface/wx/access.h
@@ -357,9 +357,9 @@ public:
 
         Acceptable values are:
         @li a null variant (IsNull() returns @true)
 
         Acceptable values are:
         @li a null variant (IsNull() returns @true)

-        @li a list variant (GetType() == wxT("list"))
+        @li a list variant (GetType() == "list")

         @li an integer representing the selected child element,
         @li an integer representing the selected child element,

-            or 0 if this object is selected (GetType() == wxT("long"))
+            or 0 if this object is selected (GetType() == "long")

         @li a "void*" pointer to a wxAccessible child object
     */
     virtual wxAccStatus GetSelections(wxVariant* selections);
         @li a "void*" pointer to a wxAccessible child object
     */
     virtual wxAccStatus GetSelections(wxVariant* selections);

diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h
index 8b0dba7b15092508ccc838fe42a049b551806153..bdca83fbfd7546f652538007025939cde2c651ec 100644 (file)
--- a/interface/wx/aui/framemanager.h
+++ b/interface/wx/aui/framemanager.h
@@ -70,8 +70,8 @@ enum wxAuiManagerOption
     @code
     wxTextCtrl* text1 = new wxTextCtrl(this, -1);
     wxTextCtrl* text2 = new wxTextCtrl(this, -1);
     @code
     wxTextCtrl* text1 = new wxTextCtrl(this, -1);
     wxTextCtrl* text2 = new wxTextCtrl(this, -1);

-    m_mgr.AddPane(text1, wxLEFT, wxT("Pane Caption"));
-    m_mgr.AddPane(text2, wxBOTTOM, wxT("Pane Caption"));
+    m_mgr.AddPane(text1, wxLEFT, "Pane Caption");
+    m_mgr.AddPane(text2, wxBOTTOM, "Pane Caption");

     m_mgr.Update();
     @endcode
 
     m_mgr.Update();
     @endcode
 

diff --git a/interface/wx/collpane.h b/interface/wx/collpane.h
index f7205fe55ef962ff8862fe259442b1362303c3bb..5718757d1f627d36d74ee3e43678442eeea6068d 100644 (file)
--- a/interface/wx/collpane.h
+++ b/interface/wx/collpane.h
@@ -65,7 +65,7 @@ public:
     Usage sample:
 
     @code
     Usage sample:
 
     @code

-    wxCollapsiblePane *collpane = new wxCollapsiblePane(this, wxID_ANY, wxT("Details:"));
+    wxCollapsiblePane *collpane = new wxCollapsiblePane(this, wxID_ANY, "Details:");

 
     // add the pane with a zero proportion value to the 'sz' sizer which contains it
     sz->Add(collpane, 0, wxGROW|wxALL, 5);
 
     // add the pane with a zero proportion value to the 'sz' sizer which contains it
     sz->Add(collpane, 0, wxGROW|wxALL, 5);


@@ -73,7 +73,7 @@ public:
     // now add a test label in the collapsible pane using a sizer to layout it:
     wxWindow *win = collpane->GetPane();
     wxSizer *paneSz = new wxBoxSizer(wxVERTICAL);
     // now add a test label in the collapsible pane using a sizer to layout it:
     wxWindow *win = collpane->GetPane();
     wxSizer *paneSz = new wxBoxSizer(wxVERTICAL);

-    paneSz->Add(new wxStaticText(win, wxID_ANY, wxT("test!")), 1, wxGROW|wxALL, 2);
+    paneSz->Add(new wxStaticText(win, wxID_ANY, "test!"), 1, wxGROW|wxALL, 2);

     win->SetSizer(paneSz);
     paneSz->SetSizeHints(win);
     @endcode
     win->SetSizer(paneSz);
     paneSz->SetSizeHints(win);
     @endcode

diff --git a/interface/wx/html/helpctrl.h b/interface/wx/html/helpctrl.h
index 3b0803bf0d74fc06a5e99a65240e846aed093b23..50e51989a09a3a8c869af3ee6843af93c4a097c1 100644 (file)
--- a/interface/wx/html/helpctrl.h
+++ b/interface/wx/html/helpctrl.h
@@ -240,7 +240,7 @@ protected:
     @code
         // The help can be browsed during the lifetime of this object; when the
         // user quits the help, program execution will continue.
     @code
         // The help can be browsed during the lifetime of this object; when the
         // user quits the help, program execution will continue.

-        wxHtmlModalHelp help(parent, wxT("help"), wxT("My topic"));
+        wxHtmlModalHelp help(parent, "help", "My topic");

     @endcode
 
     @library{wxhtml}
     @endcode
 
     @library{wxhtml}

diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h
index 63119a136826aae0eaac6bf8f81fa563ab46a3bd..83627cd2c3f1a40977c53838fe7c76bcb127a3c5 100644 (file)
--- a/interface/wx/mdi.h
+++ b/interface/wx/mdi.h
@@ -281,7 +281,7 @@ public:
 
         @code
         frame = new MyParentFrame;
 
         @code
         frame = new MyParentFrame;

-        frame->Create(parent, myParentFrameId, wxT("My Parent Frame"));
+        frame->Create(parent, myParentFrameId, "My Parent Frame");

         @endcode
 
         @remarks
         @endcode
 
         @remarks

diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index 532bfdb5659faea00c06694059f576a6f6ab1110..8b3c3fb26b0ef76e9319d554cc9bbb1b546b06fe 100644 (file)
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -73,7 +73,7 @@ public:
         helpMenu->Append(wxID_ABOUT);
 
         // use the stock label and the stock accelerator but not the stock help string:
         helpMenu->Append(wxID_ABOUT);
 
         // use the stock label and the stock accelerator but not the stock help string:

-        helpMenu->Append(wxID_ABOUT, wxEmptyString, wxT("My custom help string"));
+        helpMenu->Append(wxID_ABOUT, wxEmptyString, "My custom help string");

 
         // use all stock properties except for the bitmap:
         wxMenuItem *mymenu = new wxMenuItem(helpMenu, wxID_ABOUT);
 
         // use all stock properties except for the bitmap:
         wxMenuItem *mymenu = new wxMenuItem(helpMenu, wxID_ABOUT);

diff --git a/interface/wx/msw/ole/activex.h b/interface/wx/msw/ole/activex.h
index 74b7d22a1b4588f65fd761501acacb5d461b525a..5bfeab0d715e446c80d81d7e6c7bc03897c025e9 100644 (file)
--- a/interface/wx/msw/ole/activex.h
+++ b/interface/wx/msw/ole/activex.h
@@ -158,9 +158,9 @@ public:
 
         virtual bool Load(const wxString& fileName)
         {
 
         virtual bool Load(const wxString& fileName)
         {

-            if(m_PDF.CallMethod(wxT("LoadFile"), fileName).GetBool())
+            if(m_PDF.CallMethod("LoadFile", fileName).GetBool())

             {
             {

-                m_PDF.CallMethod(wxT("setCurrentPage"), wxVariant((long)0));
+                m_PDF.CallMethod("setCurrentPage", wxVariant((long)0));

                 NotifyMovieLoaded(); // initial refresh
                 wxSizeEvent event;
                 m_pAX->OnSize(event);
                 NotifyMovieLoaded(); // initial refresh
                 wxSizeEvent event;
                 m_pAX->OnSize(event);


@@ -171,7 +171,7 @@ public:
         }
         virtual bool Load(const wxURI& location)
         {
         }
         virtual bool Load(const wxURI& location)
         {

-            return m_PDF.CallMethod(wxT("LoadFile"), location.BuildUnescapedURI()).GetBool();
+            return m_PDF.CallMethod("LoadFile", location.BuildUnescapedURI()).GetBool();

         }
         virtual bool Load(const wxURI& WXUNUSED(location),
                         const wxURI& WXUNUSED(proxy))
         }
         virtual bool Load(const wxURI& WXUNUSED(location),
                         const wxURI& WXUNUSED(proxy))


@@ -186,7 +186,7 @@ public:
 
         virtual bool SetPosition(wxLongLong where)
         {
 
         virtual bool SetPosition(wxLongLong where)
         {

-            m_PDF.CallMethod(wxT("setCurrentPage"), wxVariant((long)where.GetValue()));
+            m_PDF.CallMethod("setCurrentPage", wxVariant((long)where.GetValue()));

             return true;
         }
         virtual wxLongLong GetPosition()
             return true;
         }
         virtual wxLongLong GetPosition()


@@ -229,13 +229,13 @@ public:
         {
             if(flags)
             {
         {
             if(flags)
             {

-                m_PDF.CallMethod(wxT("setShowToolbar"), true);
-                m_PDF.CallMethod(wxT("setShowScrollbars"), true);
+                m_PDF.CallMethod("setShowToolbar", true);
+                m_PDF.CallMethod("setShowScrollbars", true);

             }
             else
             {
             }
             else
             {

-                m_PDF.CallMethod(wxT("setShowToolbar"), false);
-                m_PDF.CallMethod(wxT("setShowScrollbars"), false);
+                m_PDF.CallMethod("setShowToolbar", false);
+                m_PDF.CallMethod("setShowScrollbars", false);

             }
 
             return true;
             }
 
             return true;


@@ -251,9 +251,9 @@ public:
     Put this in one of your existant source files and then create a wxMediaCtrl with
 
     //[this] is the parent window, "myfile.pdf" is the PDF file to open
     Put this in one of your existant source files and then create a wxMediaCtrl with
 
     //[this] is the parent window, "myfile.pdf" is the PDF file to open

-    wxMediaCtrl* mymediactrl = new wxMediaCtrl(this, wxT("myfile.pdf"), wxID_ANY,
+    wxMediaCtrl* mymediactrl = new wxMediaCtrl(this, "myfile.pdf", wxID_ANY,

                                             wxDefaultPosition, wxSize(300,300),
                                             wxDefaultPosition, wxSize(300,300),

-                                            0, wxT("wxPDFMediaBackend"));
+                                            0, "wxPDFMediaBackend");

     @endcode
 
 
     @endcode
 
 


@@ -262,7 +262,7 @@ public:
     @library{wxbase}
     @category{misc,ipc}
 
     @library{wxbase}
     @category{misc,ipc}
 

-    @see wxActiveXEvent, @ref page_samples_flash Flash sample
+    @see wxActiveXEvent, @ref page_samples_flash

 */
 class wxActiveXContainer : public wxControl
 {
 */
 class wxActiveXContainer : public wxControl
 {

diff --git a/interface/wx/notebook.h b/interface/wx/notebook.h
index d323d92e1384e5099a797e611b24f7e48a64b3e2..a04135c4ace70833df99f22c7604fb1dc183a2d2 100644 (file)
--- a/interface/wx/notebook.h
+++ b/interface/wx/notebook.h
@@ -65,7 +65,7 @@
 
     To disable themed pages globally:
     @code
 
     To disable themed pages globally:
     @code

-    wxSystemOptions::SetOption(wxT("msw.notebook.themed-background"), 0);
+    wxSystemOptions::SetOption("msw.notebook.themed-background", 0);

     @endcode
 
     Set the value to 1 to enable it again.
     @endcode
 
     Set the value to 1 to enable it again.

diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index 07af2d11eaeb91c6950c3419bc5cf6d1f01a00b5..9b7c9bbe05b458584bbb5b12fb85ac30da2ceca6 100644 (file)
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -80,7 +80,7 @@ enum wxPropertySheetDialogFlags
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);

-        GetBookCtrl()->AddPage(panel, wxT("General"));
+        GetBookCtrl()->AddPage(panel, "General");

 
         LayoutDialog();
         return true;
 
         LayoutDialog();
         return true;

diff --git a/interface/wx/propgrid/manager.h b/interface/wx/propgrid/manager.h
index 473dd12b54fa9ab9035b6df79c11b0547e01d2f7..1b2e3a14cda229549e47d839bb3865bf05921740 100644 (file)
--- a/interface/wx/propgrid/manager.h
+++ b/interface/wx/propgrid/manager.h
@@ -170,19 +170,19 @@ public:
 
         wxPropertyGridPage* page;
 
 
         wxPropertyGridPage* page;
 

-        page = pgMan->AddPage(wxT("First Page"));
+        page = pgMan->AddPage("First Page");

 
 

-        page->Append( new wxPropertyCategory(wxT("Category A1")) );
+        page->Append( new wxPropertyCategory("Category A1") );

 
 

-        page->Append( new wxIntProperty(wxT("Number"),wxPG_LABEL,1) );
+        page->Append( new wxIntProperty("Number",wxPG_LABEL,1) );

 
 

-        page->Append( new wxColourProperty(wxT("Colour"),wxPG_LABEL,*wxWHITE) );
+        page->Append( new wxColourProperty("Colour",wxPG_LABEL,*wxWHITE) );

 
 

-        page = pgMan->AddPage(wxT("Second Page"));
+        page = pgMan->AddPage("Second Page");

 
 

-        page->Append( wxT("Text"),wxPG_LABEL,wxT("(no text)") );
+        page->Append( "Text",wxPG_LABEL,"(no text)" );

 
 

-        page->Append( new wxFontProperty(wxT("Font"),wxPG_LABEL) );
+        page->Append( new wxFontProperty("Font",wxPG_LABEL) );

     @endcode
 
     @section propgridmanager_window_styles_ Window Styles
     @endcode
 
     @section propgridmanager_window_styles_ Window Styles

diff --git a/interface/wx/regex.h b/interface/wx/regex.h
index 147ea7622e34e1cf4949d347988c545e9a8f7e4f..c414b9f47f729547b8cd4da5eadc615e3cc4e079 100644 (file)
--- a/interface/wx/regex.h
+++ b/interface/wx/regex.h
@@ -94,19 +94,19 @@ enum
     @code
     wxString text;
     ...
     @code
     wxString text;
     ...

-    wxRegEx reEmail = wxT("([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)");
+    wxRegEx reEmail = "([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)";

     if ( reEmail.Matches(text) )
     {
         wxString text = reEmail.GetMatch(email);
         wxString username = reEmail.GetMatch(email, 1);
     if ( reEmail.Matches(text) )
     {
         wxString text = reEmail.GetMatch(email);
         wxString username = reEmail.GetMatch(email, 1);

-        if ( reEmail.GetMatch(email, 3) == wxT("com") ) // .com TLD?
+        if ( reEmail.GetMatch(email, 3) == "com" ) // .com TLD?

         {
             ...
         }
     }
 
     // or we could do this to hide the email address
         {
             ...
         }
     }
 
     // or we could do this to hide the email address

-    size_t count = reEmail.ReplaceAll(text, wxT("HIDDEN@\\2\\3"));
+    size_t count = reEmail.ReplaceAll(text, "HIDDEN@\\2\\3");

     printf("text now contains %u hidden addresses", count);
     @endcode
 */
     printf("text now contains %u hidden addresses", count);
     @endcode
 */

diff --git a/interface/wx/richtext/richtextformatdlg.h b/interface/wx/richtext/richtextformatdlg.h
index 5ef56d5c6ab045c92d5022942007ddd88219a04e..21d215d1ccdb26707ec89698d27e9ca4c91aa20e 100644 (file)
--- a/interface/wx/richtext/richtextformatdlg.h
+++ b/interface/wx/richtext/richtextformatdlg.h
@@ -167,7 +167,9 @@ public:
         details about the parameters.
     */
     bool Create(long flags, wxWindow* parent,
         details about the parameters.
     */
     bool Create(long flags, wxWindow* parent,

-                const wxString& title = wxGetTranslation(wxT("Formatting")), wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
+                const wxString& title = wxGetTranslation("Formatting"), wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
+                long style = wxDEFAULT_DIALOG_STYLE);

 
     //@{
     /**
 
     //@{
     /**

diff --git a/interface/wx/richtext/richtexthtml.h b/interface/wx/richtext/richtexthtml.h
index e697d851db5714b9b232669d32ce2d0bfcb78c44..fba16366beefd7610a9d7c18dded97d66c4be8b5 100644 (file)
--- a/interface/wx/richtext/richtexthtml.h
+++ b/interface/wx/richtext/richtexthtml.h
@@ -60,8 +60,8 @@ public:
     /**
         Constructor.
     */
     /**
         Constructor.
     */

-    wxRichTextHTMLHandler(const wxString& name = wxT("HTML"),
-                          const wxString& ext = wxT("html"),
+    wxRichTextHTMLHandler(const wxString& name = "HTML",
+                          const wxString& ext = "html",

                           int type = wxRICHTEXT_TYPE_HTML);
 
     /**
                           int type = wxRICHTEXT_TYPE_HTML);
 
     /**

diff --git a/interface/wx/richtext/richtextprint.h b/interface/wx/richtext/richtextprint.h
index ae7417c1219ee9b6bc28e4bad7ee3ce2df5ee1a0..6344debdd4d875c5a298e063c901a27a7196617a 100644 (file)
--- a/interface/wx/richtext/richtextprint.h
+++ b/interface/wx/richtext/richtextprint.h
@@ -194,7 +194,7 @@ public:
     /**
         Constructor.
     */
     /**
         Constructor.
     */

-    wxRichTextPrintout(const wxString& title = wxT("Printout"));
+    wxRichTextPrintout(const wxString& title = "Printout");

 
     /**
         Calculates scaling and text, header and footer rectangles.
 
     /**
         Calculates scaling and text, header and footer rectangles.


@@ -272,7 +272,7 @@ public:
         Optionally pass a title to be used in the preview frame and printing wait
         dialog, and also a parent window for these windows.
     */
         Optionally pass a title to be used in the preview frame and printing wait
         dialog, and also a parent window for these windows.
     */

-    wxRichTextPrinting(const wxString& name = wxT("Printing"),
+    wxRichTextPrinting(const wxString& name = "Printing",

                        wxWindow* parentWindow = NULL);
 
     /**
                        wxWindow* parentWindow = NULL);
 
     /**

diff --git a/interface/wx/richtext/richtextsymboldlg.h b/interface/wx/richtext/richtextsymboldlg.h
index 5391f5a81021015f741e024123d6826eb12599cb..3e1778910c125071be6a149a75ea6263cd30c1a4 100644 (file)
--- a/interface/wx/richtext/richtextsymboldlg.h
+++ b/interface/wx/richtext/richtextsymboldlg.h
@@ -49,7 +49,7 @@
         // 'normal text', i.e. the current font) but do tell the dialog
         // what 'normal text' is.
 
         // 'normal text', i.e. the current font) but do tell the dialog
         // what 'normal text' is.
 

-        wxSymbolPickerDialog dlg(wxT("*"), wxEmptyString, currentFontName, this);
+        wxSymbolPickerDialog dlg("*", wxEmptyString, currentFontName, this);

 
         if (dlg.ShowModal() == wxID_OK)
         {
 
         if (dlg.ShowModal() == wxID_OK)
         {

diff --git a/interface/wx/richtext/richtextxml.h b/interface/wx/richtext/richtextxml.h
index 74fc2a2bc4c30166c97982f4ea919e56c5f53964..aaa42f746d94baaa4462638c0e56307485d88a16 100644 (file)
--- a/interface/wx/richtext/richtextxml.h
+++ b/interface/wx/richtext/richtextxml.h
@@ -35,8 +35,8 @@ public:
     /**
         Constructor.
     */
     /**
         Constructor.
     */

-    wxRichTextXMLHandler(const wxString& name = wxT("XML"),
-                         const wxString& ext = wxT("xml"),
+    wxRichTextXMLHandler(const wxString& name = "XML",
+                         const wxString& ext = "xml",

                          int type = wxRICHTEXT_TYPE_XML);
 
     /**
                          int type = wxRICHTEXT_TYPE_XML);
 
     /**

diff --git a/interface/wx/strconv.h b/interface/wx/strconv.h
index 22e9de28508c7253641fc525945db9e088cb7864..174133388e839ded8d50d8349873a27b1ec01544 100644 (file)
--- a/interface/wx/strconv.h
+++ b/interface/wx/strconv.h
@@ -469,7 +469,7 @@ public:
     could use it like this:
 
     @code
     could use it like this:
 
     @code

-    wxChar *name = wxT("rawfile.doc");
+    wxChar *name = "rawfile.doc";

     FILE *fil = fopen(wxFNCONV(name), "r");
     @endcode
 
     FILE *fil = fopen(wxFNCONV(name), "r");
     @endcode
 

diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index cef105a0dc669c819d9926f695853859a5923ce3..a7ccb783a747ee8a171490bb607bedb55ef309d5 100644 (file)
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -36,12 +36,12 @@
     bitmaps will inadvertently be mapped to system colours.
     To do this, set the msw.remap system option before creating the toolbar:
     @code
     bitmaps will inadvertently be mapped to system colours.
     To do this, set the msw.remap system option before creating the toolbar:
     @code

-    wxSystemOptions::SetOption(wxT("msw.remap"), 0);
+    wxSystemOptions::SetOption("msw.remap", 0);

     @endcode
     If you wish to use 32-bit images (which include an alpha channel for
     transparency) use:
     @code
     @endcode
     If you wish to use 32-bit images (which include an alpha channel for
     transparency) use:
     @code

-    wxSystemOptions::SetOption(wxT("msw.remap"), 2);
+    wxSystemOptions::SetOption("msw.remap", 2);

     @endcode
     Then colour remapping is switched off, and a transparent background
     used. But only use this option under Windows XP with true colour:
     @endcode
     Then colour remapping is switched off, and a transparent background
     used. But only use this option under Windows XP with true colour:

diff --git a/interface/wx/xml/xml.h b/interface/wx/xml/xml.h
index cabd080e2f2887fddc25f5cbb01f7adcd73ea95e..c3491b4f9287963775d9e58fb7a631a98279fa32 100644 (file)
--- a/interface/wx/xml/xml.h
+++ b/interface/wx/xml/xml.h
@@ -511,7 +511,7 @@ public:
         Loads the XML document from given stream using the given encoding. See Load().
     */
     wxXmlDocument(wxInputStream& stream,
         Loads the XML document from given stream using the given encoding. See Load().
     */
     wxXmlDocument(wxInputStream& stream,

-                  const wxString& encoding = wxT("UTF-8"));
+                  const wxString& encoding = "UTF-8");

 
     /**
         Virtual destructor. Frees the document root node.
 
     /**
         Virtual destructor. Frees the document root node.


@@ -579,14 +579,14 @@ public:
         Returns true on success, false otherwise.
     */
     virtual bool Load(const wxString& filename,
         Returns true on success, false otherwise.
     */
     virtual bool Load(const wxString& filename,

-                      const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
+                      const wxString& encoding = "UTF-8", int flags = wxXMLDOC_NONE);

 
     /**
         Like Load(const wxString&, const wxString&, int) but takes the data from
         given input stream.
     */
     virtual bool Load(wxInputStream& stream,
 
     /**
         Like Load(const wxString&, const wxString&, int) but takes the data from
         given input stream.
     */
     virtual bool Load(wxInputStream& stream,

-                      const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
+                      const wxString& encoding = "UTF-8", int flags = wxXMLDOC_NONE);

 
     /**
         Saves XML tree creating a file named with given string.
 
     /**
         Saves XML tree creating a file named with given string.

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 75b8820a00d45b851bd7071b1fe1b6f006a35ecf..849b932ea6562a43047295601602fee6dc6cd6d4 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -381,7 +381,7 @@ protected:
     /**
         Creates an animation (see wxAnimation) from the filename specified in @a param.
     */
     /**
         Creates an animation (see wxAnimation) from the filename specified in @a param.
     */

-    wxAnimation GetAnimation(const wxString& param = wxT("animation"));
+    wxAnimation GetAnimation(const wxString& param = "animation");

 
     /**
         Gets a bitmap.
 
     /**
         Gets a bitmap.


@@ -457,7 +457,7 @@ protected:
     /**
         Gets the position (may be in dialog units).
     */
     /**
         Gets the position (may be in dialog units).
     */

-    wxPoint GetPosition(const wxString& param = wxT("pos"));
+    wxPoint GetPosition(const wxString& param = "pos");

 
     /**
         Gets the size (may be in dialog units).
 
     /**
         Gets the size (may be in dialog units).


@@ -468,7 +468,7 @@ protected:
         Gets style flags from text in form "flag | flag2| flag3 |..."
         Only understands flags added with AddStyle().
     */
         Gets style flags from text in form "flag | flag2| flag3 |..."
         Only understands flags added with AddStyle().
     */

-    int GetStyle(const wxString& param = wxT("style"), int defaults = 0);
+    int GetStyle(const wxString& param = "style", int defaults = 0);

 
     /**
         Gets text from param and does some conversions:
 
     /**
         Gets text from param and does some conversions: