wxMessageBox off the main thread lost result code.

[wxWidgets.git] / interface / wx / xrc / xmlres.h

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 8e60fcf7c5ced64ea485598d501f39216a3bb26c..72583a6e86a882c2b5a35bcfe90bd488ef7b8219 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -2,7 +2,6 @@
 // Name:        xrc/xmlres.h
 // Purpose:     interface of wxXmlResource
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -579,14 +578,14 @@ protected:
     /**
         Gets a direction.
 
-        If the given @a param is not present or has empty value, @a dir is
+        If the given @a param is not present or has empty value, @a dirDefault is
         returned by default. Otherwise the value of the parameter is parsed and
         a warning is generated if it's not one of @c wxLEFT, @c wxTOP, @c
         wxRIGHT or @c wxBOTTOM.
 
         @since 2.9.3
      */
-    wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT);
+    wxDirection GetDirection(const wxString& param, wxDirection dirDefault = wxLEFT);
 
     /**
         Gets a font.
@@ -635,7 +634,7 @@ protected:
 
         @since 2.9.1
     */
-    wxImageList *GetImageList(const wxString& param = wxT("imagelist"));
+    wxImageList *GetImageList(const wxString& param = "imagelist");
 
     /**
         Gets the integer value from the parameter.