* 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-861f7616d084master
parent
176be97ec3
commit
b4afe5b827
|
@ -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()
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -25,97 +25,99 @@
|
|||
<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="wxStaticBoxSizer">
|
||||
<orient>wxVERTICAL</orient>
|
||||
<object class="wxBoxSizer">
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_0DEGREE">
|
||||
<label>0 Degrees</label>
|
||||
<object class="wxStaticBoxSizer">
|
||||
<orient>wxVERTICAL</orient>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_0DEGREE">
|
||||
<label>0 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_90DEGREE">
|
||||
<label>90 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_180DEGREE">
|
||||
<label>180 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_270DEGREE">
|
||||
<label>270 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_XFLIP">
|
||||
<label>X Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_YFLIP">
|
||||
<label>Y Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<flag>wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_90DEGREE">
|
||||
<label>90 Degrees</label>
|
||||
<object class="wxStaticBoxSizer">
|
||||
<orient>wxVERTICAL</orient>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDROTATE">
|
||||
<label>Random Rotate</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDXFLIP">
|
||||
<label>Random X Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDYFLIP">
|
||||
<label>Random Y Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_180DEGREE">
|
||||
<label>180 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxRadioButton" name="ID_RADIO_270DEGREE">
|
||||
<label>270 Degrees</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_XFLIP">
|
||||
<label>X Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_YFLIP">
|
||||
<label>Y Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<flag>wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxStaticBoxSizer">
|
||||
<orient>wxVERTICAL</orient>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDROTATE">
|
||||
<label>Random Rotate</label>
|
||||
<object class="wxStdDialogButtonSizer">
|
||||
<object class="button">
|
||||
<object class="wxButton" name="wxID_OK">
|
||||
<default>1</default>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDXFLIP">
|
||||
<label>Random X Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
<object class="button">
|
||||
<object class="wxButton" name="wxID_CANCEL" />
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<object class="wxCheckBox" name="ID_CHK_RANDYFLIP">
|
||||
<label>Random Y Flip</label>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
</object>
|
||||
<flag>wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL</flag>
|
||||
<border>2</border>
|
||||
</object>
|
||||
<object class="sizeritem">
|
||||
<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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue