From b4afe5b827dbb10180eca5eb8c5b0cc1cca055de Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@wz2100.net>
Date: Fri, 27 Jul 2007 15:33:15 +0000
Subject: [PATCH]  * 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
---
 .../src/wxDialogs/autoflagdialog.cpp          |   3 +-
 .../src/wxDialogs/autoflagdialog.hpp          |   1 -
 .../src/wxDialogs/autoflagdialog.xrc          | 154 +++++++++---------
 .../src/wxDialogs/savesegmentdialog.hpp       |   1 -
 .../src/wxDialogs/savesegmentdialog.xrc       |  17 +-
 5 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/tools/editworld/src/wxDialogs/autoflagdialog.cpp b/tools/editworld/src/wxDialogs/autoflagdialog.cpp
index 7b6dd2da1..acc82a702 100644
--- a/tools/editworld/src/wxDialogs/autoflagdialog.cpp
+++ b/tools/editworld/src/wxDialogs/autoflagdialog.cpp
@@ -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()
diff --git a/tools/editworld/src/wxDialogs/autoflagdialog.hpp b/tools/editworld/src/wxDialogs/autoflagdialog.hpp
index 97ba695ab..c37a175d2 100644
--- a/tools/editworld/src/wxDialogs/autoflagdialog.hpp
+++ b/tools/editworld/src/wxDialogs/autoflagdialog.hpp
@@ -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>
diff --git a/tools/editworld/src/wxDialogs/autoflagdialog.xrc b/tools/editworld/src/wxDialogs/autoflagdialog.xrc
index eec19e8d7..2b2deaae6 100644
--- a/tools/editworld/src/wxDialogs/autoflagdialog.xrc
+++ b/tools/editworld/src/wxDialogs/autoflagdialog.xrc
@@ -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>
diff --git a/tools/editworld/src/wxDialogs/savesegmentdialog.hpp b/tools/editworld/src/wxDialogs/savesegmentdialog.hpp
index b635a31c2..3099ddeb8 100644
--- a/tools/editworld/src/wxDialogs/savesegmentdialog.hpp
+++ b/tools/editworld/src/wxDialogs/savesegmentdialog.hpp
@@ -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>
diff --git a/tools/editworld/src/wxDialogs/savesegmentdialog.xrc b/tools/editworld/src/wxDialogs/savesegmentdialog.xrc
index 065a0858a..4bf459d3b 100644
--- a/tools/editworld/src/wxDialogs/savesegmentdialog.xrc
+++ b/tools/editworld/src/wxDialogs/savesegmentdialog.xrc
@@ -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>