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

Support fractional font sizes and numeric weights in XRC

Browse Source 
Change the code to handle them, the XRC sample to test them, the schema
to accept them and the documentation to describe them.
This commit is contained in:
Vadim Zeitlin
2018-09-15 13:30:45 +02:00
parent aedf89b098
commit ca164bb4ca
4 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/xrc/rc/controls.xrc
View File

@@ -347,7 +347,6 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>5</border>
<option>1</option>
<object class="wxCollapsiblePane" name="controls_collpane">
<label>Details:</label>
<collapsed>0</collapsed>
@@ -1096,6 +1095,23 @@ lay them out using wxSizers, absolute positioning, everything you like!
<label>It was a dark and stormy night.</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="wxID_STATIC">
<label>Slightly larger font:</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
<object class="wxStaticText" name="controls_statictext">
<label>It was a dark and stormy night.</label>
<font>
<size>12.5</size>
</font>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
<border>5</border>
@@ -1127,7 +1143,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
<label>It was a dark and stormy night.</label>
<font>
<inherit>1</inherit>
<weight>bold</weight>
<weight>700</weight> <!-- same as "bold" -->
</font>
</object>
</object>
@@ -1494,7 +1510,6 @@ lay them out using wxSizers, absolute positioning, everything you like!
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<option>1</option>
<border>5</border>
<object class="wxColourPickerCtrl" name="controls_colourpicker">
<value>#00ff00</value>
@@ -1510,7 +1525,6 @@ lay them out using wxSizers, absolute positioning, everything you like!
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<option>1</option>
<border>5</border>
<object class="wxFilePickerCtrl" name="controls_filepicker">
<message>Here goes a message</message>
@@ -1528,7 +1542,6 @@ lay them out using wxSizers, absolute positioning, everything you like!
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<option>1</option>
<border>5</border>
<object class="wxDirPickerCtrl" name="controls_dirpicker">
<value/>
@@ -1545,7 +1558,6 @@ lay them out using wxSizers, absolute positioning, everything you like!
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<option>1</option>
<border>5</border>
<object class="wxFontPickerCtrl" name="controls_fontpicker">
<style>wxFNTP_USEFONT_FOR_LABEL</style>