Warning fix.

[wxWidgets.git] / utils / configtool / src / configitemselector.cpp

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index 111a66c7a0d7466b70d84a575e926c30d83470bb..450c11c1dea46d57f98d88ece9a2d13ab0113a30 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -13,25 +13,26 @@
 #pragma implementation "configitemselector.h"
 #endif
 
 #pragma implementation "configitemselector.h"
 #endif
 

+// For compilers that support precompilation, includes "wx/wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
-#endif

 
 

-#include <wx/cshelp.h>
-#include <wx/statline.h>
-#include <wx/splitter.h>
-#include <wx/scrolwin.h>
-#include <wx/spinctrl.h>
-#include <wx/spinbutt.h>
-#include <wx/valgen.h>
-#include <wx/notebook.h>
+#include "wx/statline.h"
+#include "wx/splitter.h"
+#include "wx/scrolwin.h"
+#include "wx/spinctrl.h"
+#include "wx/spinbutt.h"
+
+#endif

 
 

+#include "wx/cshelp.h"
+#include "wx/notebook.h"
+#include "wx/valgen.h"

 #include "configitemselector.h"
 #include "configtooldoc.h"
 #include "configtoolview.h"
 #include "configitemselector.h"
 #include "configtooldoc.h"
 #include "configtoolview.h"


@@ -71,9 +72,9 @@ END_EVENT_TABLE()
  * ctConfigItemsSelector constructor
  */
 
  * ctConfigItemsSelector constructor
  */
 

-ctConfigItemsSelector::ctConfigItemsSelector( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+ctConfigItemsSelector::ctConfigItemsSelector( wxWindow* parent, wxWindowID id, const wxString& caption)

 {
 {

-    wxDialog::Create( parent, id, caption, pos, size, style );
+    wxDialog::Create( parent, id, caption);

 
     CreateControls();
     InitSourceConfigList();
 
     CreateControls();
     InitSourceConfigList();


@@ -129,11 +130,11 @@ void ctConfigItemsSelector::CreateControls()
 
     item13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
     item13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    wxButton* item15 = new wxButton(item1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item15 = new wxButton(item1, wxID_OK);

     item15->SetDefault();
     item13->Add(item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     item15->SetDefault();
     item13->Add(item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    wxButton* item16 = new wxButton(item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item16 = new wxButton(item1, wxID_CANCEL);

     item13->Add(item16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     GetSizer()->Fit(this);
     item13->Add(item16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     GetSizer()->Fit(this);


@@ -251,7 +252,7 @@ void ctConfigItemsSelector::InitSourceConfigList(ctConfigItem* item)
         masterList->Append(item->GetName());
     }
 
         masterList->Append(item->GetName());
     }
 

-    wxNode* node = item->GetChildren().GetFirst();
+    wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst();

     while (node)
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
     while (node)
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();