diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 69d4e845ca..ef77421733 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -951,9 +951,9 @@ Example: @beginTable @hdr3col{property, type, description} @row3col{defaultdirectory, @ref overview_xrcformat_type_string, - Sets the current directory displayed in the control. } + Sets the current directory displayed in the control (default: empty). } @row3col{defaultfilename, @ref overview_xrcformat_type_string, - Selects a certain file.} + Selects a certain file (default: empty).} @row3col{wildcard, @ref overview_xrcformat_type_string, Sets the wildcard, which can contain multiple file types, for example: "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif" diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc index 5ee0d91290..4986ea6efb 100644 --- a/misc/schema/xrc_schema.rnc +++ b/misc/schema/xrc_schema.rnc @@ -760,9 +760,9 @@ wxFileCtrl = attribute class { "wxFileCtrl" } & stdObjectNodeAttributes & stdWindowProperties & - [xrc:p="o"] element value {_, t_string }* & - [xrc:p="r"] element message {_, t_text }+ & - [xrc:p="o"] element wildcard {_, t_string }* + [xrc:p="o"] element defaultdirectory {_, t_string }* & + [xrc:p="o"] element defaultfilename {_, t_string }* & + [xrc:p="o"] element wildcard {_, t_string }* } diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc index 1442be70af..6675e4ec06 100644 --- a/samples/xrc/rc/controls.xrc +++ b/samples/xrc/rc/controls.xrc @@ -472,7 +472,6 @@ lay them out using wxSizers, absolute positioning, everything you like! 5 Text files (*.txt) - Choose file