From 374caf23011649a25e538505c4af173ab0827fd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 15 Jul 2006 15:21:25 +0000 Subject: [PATCH] use instead of for initial value of picker controls in XRC, for consistency with other controls' handlers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/xrc/rc/controls.xrc | 10 +++++----- src/xrc/xh_clrpicker.cpp | 2 +- src/xrc/xh_dirpicker.cpp | 2 +- src/xrc/xh_filepicker.cpp | 2 +- src/xrc/xh_fontpicker.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc index 81139cb851..2a92ca1362 100644 --- a/samples/xrc/rc/controls.xrc +++ b/samples/xrc/rc/controls.xrc @@ -970,7 +970,7 @@ 5 - #00ff00 + #00ff00 @@ -989,7 +989,7 @@ Here goes a message *.png - + @@ -1004,7 +1004,7 @@ 5 - + Here goes a message @@ -1022,10 +1022,10 @@ 5 - + 20 wxSYS_DEFAULT_GUI_FONT - + diff --git a/src/xrc/xh_clrpicker.cpp b/src/xrc/xh_clrpicker.cpp index 58afba8f72..4f977b20f2 100644 --- a/src/xrc/xh_clrpicker.cpp +++ b/src/xrc/xh_clrpicker.cpp @@ -36,7 +36,7 @@ wxObject *wxColourPickerCtrlXmlHandler::DoCreateResource() picker->Create(m_parentAsWindow, GetID(), - GetColour(wxT("colour")), + GetColour(wxT("value")), GetPosition(), GetSize(), GetStyle(_T("style"), wxCLRP_DEFAULT_STYLE), wxDefaultValidator, diff --git a/src/xrc/xh_dirpicker.cpp b/src/xrc/xh_dirpicker.cpp index ab589e82b3..91ad6b0b66 100644 --- a/src/xrc/xh_dirpicker.cpp +++ b/src/xrc/xh_dirpicker.cpp @@ -37,7 +37,7 @@ wxObject *wxDirPickerCtrlXmlHandler::DoCreateResource() picker->Create(m_parentAsWindow, GetID(), - GetParamValue(wxT("default-path")), + GetParamValue(wxT("value")), GetParamValue(wxT("message")), GetPosition(), GetSize(), GetStyle(_T("style"), wxDIRP_DEFAULT_STYLE), diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp index 3178c07ac4..cf4fa8ba8e 100644 --- a/src/xrc/xh_filepicker.cpp +++ b/src/xrc/xh_filepicker.cpp @@ -39,7 +39,7 @@ wxObject *wxFilePickerCtrlXmlHandler::DoCreateResource() picker->Create(m_parentAsWindow, GetID(), - GetParamValue(wxT("default-path")), + GetParamValue(wxT("value")), GetParamValue(wxT("message")), GetParamValue(wxT("wildcard")), GetPosition(), GetSize(), diff --git a/src/xrc/xh_fontpicker.cpp b/src/xrc/xh_fontpicker.cpp index a1bf36d7aa..6222b3dfc3 100644 --- a/src/xrc/xh_fontpicker.cpp +++ b/src/xrc/xh_fontpicker.cpp @@ -36,8 +36,8 @@ wxObject *wxFontPickerCtrlXmlHandler::DoCreateResource() XRC_MAKE_INSTANCE(picker, wxFontPickerCtrl) wxFont f = *wxNORMAL_FONT; - if (HasParam(wxT("default-font"))) - f = GetFont(wxT("default-font")); + if (HasParam(wxT("value"))) + f = GetFont(wxT("value")); picker->Create(m_parentAsWindow, GetID(), -- 2.50.0