From fe94d0d06a2305845f0cb0c0b8fc0edbde2e2b68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 11 Sep 2013 15:20:13 +0000 Subject: [PATCH] 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 --- include/wx/xrc/xmlres.h | 2 +- interface/wx/xrc/xmlres.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index f69d993..8924bcc 100644 --- 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 a264d2a..72583a6 100644 --- 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. -- 2.7.4