Better name for wxXmlResource::GetDirection() argument.

'dir' is not very descriptive (of course it's a direction!), it's better
to include 'default' in the name to indicate this is the default value
to use in absence of a specific one.

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index f69d9939d957f3928cd8ffbe64432ce9c53007af..8924bcc391341c21e43da1adcd73840b8e15d833 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -540,7 +540,7 @@ public:
                          wxWindow *windowToUse = NULL);
 
     // Gets a direction, complains if the value is invalid.
-    wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT);
+    wxDirection GetDirection(const wxString& param, wxDirection dirDefault = wxLEFT);
 
     // Gets a bitmap.
     wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index a264d2ab39d05a2ca60568cf307fda6762f6b55a..72583a6e86a882c2b5a35bcfe90bd488ef7b8219 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -578,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.