Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support proportions for wxFlexGridSizer growables in XRC schema

Browse Source 
The value of "growablerows" and "growablecols" elements is not just a
list of numbers, but a list of numbers with optional weights, specified
after a colon.

Update the XRC schema to account for the weights too.

See #17802.

(cherry picked from commit 0d73253111)
This commit is contained in:
Vadim Zeitlin
2017-02-19 15:47:01 +01:00
parent 24604a2b5b
commit be0eb3d213
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc/schema/xrc_schema.rnc
View File

@@ -461,6 +461,8 @@ t_imagelist = (
t_list_of_numbers = xsd:string { pattern = "\d+(,\d+)*" } t_list_of_numbers = xsd:string { pattern = "\d+(,\d+)*" }
t_list_of_numbers_with_weights = xsd:string { pattern = "\d+(:\d+)?(,\d+(:\d+)?)*" }
# #
# Handlers for non-<object> content: # Handlers for non-<object> content:
@@ -1589,8 +1591,8 @@ wxFlexGridSizer =
[xrc:p="o"] element nonflexiblegrowmode {_, ("wxFLEX_GROWMODE_NONE" | [xrc:p="o"] element nonflexiblegrowmode {_, ("wxFLEX_GROWMODE_NONE" |
"wxFLEX_GROWMODE_SPECIFIED" | "wxFLEX_GROWMODE_SPECIFIED" |
"wxFLEX_GROWMODE_ALL") }* & "wxFLEX_GROWMODE_ALL") }* &
[xrc:p="o"] element growablerows {_, t_list_of_numbers }* & [xrc:p="o"] element growablerows {_, t_list_of_numbers_with_weights }* &
[xrc:p="o"] element growablecols {_, t_list_of_numbers }* & [xrc:p="o"] element growablecols {_, t_list_of_numbers_with_weights }* &
(wxSizer_item | objectRef)* (wxSizer_item | objectRef)*
} }
@@ -1605,8 +1607,8 @@ wxGridBagSizer =
[xrc:p="o"] element nonflexiblegrowmode {_, ("wxFLEX_GROWMODE_NONE" | [xrc:p="o"] element nonflexiblegrowmode {_, ("wxFLEX_GROWMODE_NONE" |
"wxFLEX_GROWMODE_SPECIFIED" | "wxFLEX_GROWMODE_SPECIFIED" |
"wxFLEX_GROWMODE_ALL") }* & "wxFLEX_GROWMODE_ALL") }* &
[xrc:p="o"] element growablerows {_, t_list_of_numbers }* & [xrc:p="o"] element growablerows {_, t_list_of_numbers_with_weights }* &
[xrc:p="o"] element growablecols {_, t_list_of_numbers }* & [xrc:p="o"] element growablecols {_, t_list_of_numbers_with_weights }* &
(wxSizer_item | objectRef)* (wxSizer_item | objectRef)*
} }