X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9ab621ea2513f623f3f7c1699648f189e37be3f..08b97268061292f7c3794dae243a6490b23a42f1:/utils/configtool/src/settingsdialog.cpp

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index a01dc52bd9..d379dcc85e 100644
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settingsdialog.cpp
+// Name:        utils/configtool/src/settingsdialog.cpp
 // Purpose:     Settings dialog
 // Author:      Julian Smart
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settingsdialog.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -22,11 +18,17 @@
 
 #ifndef WX_PRECOMP
 
+#include "wx/intl.h"
 #include "wx/statline.h"
 #include "wx/splitter.h"
 #include "wx/scrolwin.h"
 #include "wx/spinctrl.h"
 #include "wx/spinbutt.h"
+#include "wx/sizer.h"
+#include "wx/statbox.h"
+#include "wx/dirdlg.h"
+#include "wx/stattext.h"
+#include "wx/choice.h"
 
 #endif
 
@@ -86,7 +88,7 @@ void ctSettingsDialog::CreateControls()
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
 
-    m_notebook = new wxNotebook(item1, wxID_ANY, wxDefaultPosition, wxSize(200, 200), wxNB_TOP);
+    m_notebook = new wxNotebook(item1, wxID_ANY, wxDefaultPosition, wxSize(200, 200), wxBK_TOP);
     ctGeneralSettingsDialog* item4 = new ctGeneralSettingsDialog(m_notebook, ID_GENERAL_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
     m_notebook->AddPage(item4, _("General"));
     ctLocationSettingsDialog* item11 = new ctLocationSettingsDialog(m_notebook, ID_LOCATION_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
@@ -98,14 +100,14 @@ void ctSettingsDialog::CreateControls()
 
     item21->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* item23 = new wxButton(item1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item23 = new wxButton(item1, wxID_OK);
     item23->SetDefault();
     item21->Add(item23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* item24 = new wxButton(item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item24 = new wxButton(item1, wxID_CANCEL);
     item21->Add(item24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* item25 = new wxButton(item1, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item25 = new wxButton(item1, wxID_HELP);
     item21->Add(item25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 #if defined(__WXGTK__) || defined(__WXMAC__)
@@ -163,7 +165,7 @@ void ctSettingsDialog::OnHelp( wxCommandEvent& WXUNUSED(event) )
             helpTopic = wxT("Location settings dialog");
         }
 
-        if (!helpTopic.IsEmpty())
+        if (!helpTopic.empty())
         {
             wxGetApp().GetHelpController().DisplaySection(helpTopic);
         }