ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wX XRC for wX 3.2 

Some sizeritems in horizontal box sizers had the wxALIGN_RIGHT flag,
which makes no sense in horizontal sizers, since they allow only
aligning things vertically. This was throwing XRC errors on startup.

Remove the erroneous wxALIGN_RIGHT flags from the XRC.
This commit is contained in:
Rafael Kitover 2016-12-13 10:03:38 -08:00
parent 94b62b13b3
commit d5020b905c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wx/xrc/GBColorPrefPanel.xrc
View File

@ -93,7 +93,7 @@
<object class="wxButton" name="Reset"> <object class="wxButton" name="Reset">
<label>Restore</label> <label>Restore</label>
</object> </object>
<flag>wxALL|wxALIGN_RIGHT</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
</object> </object>
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>

2
src/wx/xrc/GBPaletteViewer.xrc
View File

@ -121,7 +121,7 @@
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxButton" name="wxID_CLOSE"/> <object class="wxButton" name="wxID_CLOSE"/>
<flag>wxALL|wxALIGN_RIGHT</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
</object> </object>
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>

4
src/wx/xrc/GameBoyConfig.xrc
View File

@ -20,7 +20,7 @@
<label>Emulated _system :</label> <label>Emulated _system :</label>
</object> </object>
<option>1</option> <option>1</option>
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
@ -48,7 +48,7 @@
<label>Display _borders :</label> <label>Display _borders :</label>
</object> </object>
<option>1</option> <option>1</option>
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">

2
src/wx/xrc/GeneralConfig.xrc
View File

@ -95,7 +95,7 @@
<label>_Rewind interval :</label> <label>_Rewind interval :</label>
<tooltip>If not empty or 0, enable rewind (seconds)</tooltip> <tooltip>If not empty or 0, enable rewind (seconds)</tooltip>
</object> </object>
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">