Merge branch 'statbox-any-label'

Add support for using any wxWindow (and not just the equivalent of
wxStaticText) as wxStaticBox label.

See https://github.com/wxWidgets/wxWidgets/pull/650
This commit is contained in:
Vadim Zeitlin
2018-01-23 15:40:31 +01:00
19 changed files with 710 additions and 152 deletions

View File

@@ -983,6 +983,58 @@ lay them out using wxSizers, absolute positioning, everything you like!
<object class="wxStaticBoxSizer">
<orient>wxVERTICAL</orient>
<label>Internet options</label>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxRadioButton">
<style>wxRB_GROUP</style>
<label>Use _proxy</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxRadioButton">
<label>Use _VPN</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxRadioButton">
<label>Use _Tor</label>
<value>1</value>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>5</border>
<object class="wxStaticBoxSizer">
<orient>wxVERTICAL</orient>
<windowlabel>
<object class="wxCheckBox">
<label>Enable quantum mechanics</label>
<checked>1</checked>
</object>
</windowlabel>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxRadioButton">
<style>wxRB_GROUP</style>
<label>Cat is dead</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxRadioButton">
<label>Cat is alive</label>
<value>1</value>
</object>
</object>
</object>
</object>
</object>