use <value> instead of <default-*> for initial value of picker controls in XRC, for...

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

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 81139cb851b09bbee55c928534f3d3d9053d1039..2a92ca13625a11c7d4fe2abeecb585e52e9b9c10 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -970,7 +970,7 @@
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxColourPickerCtrl" name="controls_colourpicker">
-                                    <colour>#00ff00</colour>
+                                    <value>#00ff00</value>
                                     <style>wxCLRP_SHOW_LABEL</style>
                                 </object>
                             </object>
@@ -989,7 +989,7 @@
                                     <message>Here goes a message</message>
                                     <style>wxFLP_OPEN</style>
                                     <wildcard>*.png</wildcard>
-                                    <default-path/>
+                                    <value/>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -1004,7 +1004,7 @@
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxDirPickerCtrl" name="controls_dirpicker">
-                                    <default-path/>
+                                    <value/>
                                     <style>wxDIRP_CHANGE_DIR</style>
                                     <message>Here goes a message</message>
                                 </object>
@@ -1022,10 +1022,10 @@
                                 <border>5</border>
                                 <object class="wxFontPickerCtrl" name="controls_fontpicker">
                                     <style>wxFNTP_USEFONT_FOR_LABEL</style>
-                                    <default-font>
+                                    <value>
                                         <size>20</size>
                                         <sysfont>wxSYS_DEFAULT_GUI_FONT</sysfont>
-                                    </default-font>
+                                    </value>
                                 </object>
                             </object>
                         </object>

diff --git a/src/xrc/xh_clrpicker.cpp b/src/xrc/xh_clrpicker.cpp
index 58afba8f72b7182bd3df74c4de34a16e804a2658..4f977b20f21ec18be0039981c7268b4f1d1234d5 100644 (file)
--- 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 ab589e82b3c8437f0daef0b1721dcf14745d6fcf..91ad6b0b661c45e40d32de79146baab643545d9b 100644 (file)
--- 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 3178c07ac43f37ea53d407fd8192d488e31de0b3..cf4fa8ba8e19e383e2c6b5d01510b93c0376c368 100644 (file)
--- 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 a1bf36d7aa9f9f096b88f1ecee81271f3c08606b..6222b3dfc34aa20c66c04ba2fad9c0a0bd090f6b 100644 (file)
--- 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(),