Correct headers. No more specific notebook sizer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index c877f95df1a76d2616f36a21b32792335d62e46e..d406664e7a34a6bc7257fbeaea6847ac3a67054f 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -13,7 +13,16 @@
 #pragma implementation "configitemselector.h"
 #endif
 
-#include <wx/wx.h>
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
 #include <wx/cshelp.h>
 #include <wx/statline.h>
 #include <wx/splitter.h>
@@ -21,6 +30,7 @@
 #include <wx/spinctrl.h>
 #include <wx/spinbutt.h>
 #include <wx/valgen.h>
+#include <wx/notebook.h>
 
 #include "configitemselector.h"
 #include "configtooldoc.h"

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index 4d8a7ef4f8ceb781b254ca65a5d308bf7c67f309..c012726ac1bf2d8d9ff4df8a121c74abc2ae568b 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -78,12 +78,11 @@ void ctSettingsDialog::CreateControls()
     item1->SetSizer(item2);
 
     wxNotebook* item3 = new wxNotebook(item1, ID_NOTEBOOK, wxDefaultPosition, wxSize(200, 200), wxNB_TOP);
-    wxNotebookSizer* item3Sizer = new wxNotebookSizer(item3);
     ctGeneralSettingsDialog* item4 = new ctGeneralSettingsDialog(item3, ID_GENERAL_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
     item3->AddPage(item4, _("General"));
     ctLocationSettingsDialog* item11 = new ctLocationSettingsDialog(item3, ID_LOCATION_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
     item3->AddPage(item11, _("Locations"));
-    item2->Add(item3Sizer, 0, wxGROW|wxALL, 5);
+    item2->Add(item3, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* item21 = new wxBoxSizer(wxHORIZONTAL);
     item2->Add(item21, 0, wxGROW|wxALL, 5);