Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use wxStdDialogButtonSizer for the default buttons instead of a wxBoxSizer with some wxButtons in it 

* Rename the dialog in savesegmentdialog.xrc from "Dialog" to "Save Map Segment"

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2220 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-07-27 15:33:15 +00:00
parent 176be97ec3
commit b4afe5b827
5 changed files with 85 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/editworld/src/wxDialogs/autoflagdialog.cpp
View File

@ -83,8 +83,9 @@ AutoFlagDialog::AutoFlagDialog(wxWindow* parent,
Connect(XRCID("ID_CHK_RANDROTATE"),wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)&AutoFlagDialog::OnRandRotate);
Connect(XRCID("ID_CHK_RANDXFLIP"),wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)&AutoFlagDialog::OnRandXFlip);
Connect(XRCID("ID_CHK_RANDYFLIP"),wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)&AutoFlagDialog::OnRandYFlip);
Connect(XRCID("wxID_OK"),wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&AutoFlagDialog::OnOK);
//*)
Connect(XRCID("wxID_OK"),wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&AutoFlagDialog::OnOK);
}
AutoFlagDialog::~AutoFlagDialog()

1
tools/editworld/src/wxDialogs/autoflagdialog.hpp
View File

@ -28,7 +28,6 @@
#include <wx/wxprec.h>
//(*Headers(AutoFlagDialog)
#include <wx/button.h>
#include <wx/checkbox.h>
#include <wx/dialog.h>
#include <wx/radiobut.h>

20
tools/editworld/src/wxDialogs/autoflagdialog.xrc
View File

@ -25,9 +25,10 @@
<resource xmlns="http://www.wxwidgets.org/wxxrc">
<object class="wxDialog" name="AutoFlagDialog">
<title>Paint Orientation</title>
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>2</rows>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxStaticBoxSizer">
<orient>wxVERTICAL</orient>
@ -105,17 +106,18 @@
<flag>wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL</flag>
<border>2</border>
</object>
</object>
</object>
<object class="sizeritem">
<object class="wxStdDialogButtonSizer">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
<border>2</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
<object class="button">
<object class="wxButton" name="wxID_CANCEL" />
</object>
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
<border>2</border>

1
tools/editworld/src/wxDialogs/savesegmentdialog.hpp
View File

@ -28,7 +28,6 @@
#include <wx/wxprec.h>
//(*Headers(SaveSegmentDialog)
#include <wx/button.h>
#include <wx/dialog.h>
#include <wx/sizer.h>
#include <wx/stattext.h>

17
tools/editworld/src/wxDialogs/savesegmentdialog.xrc
View File

@ -24,7 +24,7 @@
-->
<resource xmlns="http://www.wxwidgets.org/wxxrc">
<object class="wxDialog" name="SaveSegmentDialog">
<title>Dialog</title>
<title>Save Map Segment</title>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
@ -92,21 +92,14 @@
<border>2</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxStdDialogButtonSizer">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>OK</label>
<default>1</default>
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
<border>2</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>Cancel</label>
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
<border>2</border>
<object class="button">
<object class="wxButton" name="wxID_CANCEL" />
</object>
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>