added except sample

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

diff --git a/utils/configtool/src/configitemselector.cpp b/utils/configtool/src/configitemselector.cpp
index 35b6ae10bc8b7c6e6fad6ffeac66ff5021aecd53..d406664e7a34a6bc7257fbeaea6847ac3a67054f 100644 (file)
--- a/utils/configtool/src/configitemselector.cpp
+++ b/utils/configtool/src/configitemselector.cpp
@@ -9,11 +9,20 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation configitemselector.cpp
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "configitemselector.h"
+#endif
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
 #endif
 
-#include <wx/wx.h>
 #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"
@@ -74,14 +84,13 @@ ctConfigItemsSelector::ctConfigItemsSelector( wxWindow* parent, wxWindowID id, c
  */
 
 void ctConfigItemsSelector::CreateControls()
-{    
+{
 ////@begin ctConfigItemsSelector content construction
 
     ctConfigItemsSelector* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
-    item1->SetAutoLayout(TRUE);
 
     wxBoxSizer* item3 = new wxBoxSizer(wxVERTICAL);
     item2->Add(item3, 1, wxGROW|wxALL, 5);
@@ -93,7 +102,7 @@ void ctConfigItemsSelector::CreateControls()
     item3->Add(item5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxString* item6Strings = NULL;
-    wxListBox* item6 = new wxListBox(item1, ID_AVAILABLE_CONFIG_ITEMS, wxDefaultPosition, wxSize(-1, 150), 0, item6Strings, wxLB_SINGLE|wxLB_SORT);
+    wxListBox* item6 = new wxListBox(item1, ID_AVAILABLE_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultSize.x, 150), 0, item6Strings, wxLB_SINGLE|wxLB_SORT);
     item3->Add(item6, 1, wxGROW|wxALL, 5);
 
     wxStaticText* item7 = new wxStaticText(item1, wxID_STATIC, _("&List of configuration items:"), wxDefaultPosition, wxDefaultSize, 0);
@@ -103,7 +112,7 @@ void ctConfigItemsSelector::CreateControls()
     item3->Add(item8, 0, wxGROW, 5);
 
     wxString* item9Strings = NULL;
-    wxListBox* item9 = new wxListBox(item1, ID_CONFIG_ITEMS, wxDefaultPosition, wxSize(-1, 100), 0, item9Strings, wxLB_SINGLE);
+    wxListBox* item9 = new wxListBox(item1, ID_CONFIG_ITEMS, wxDefaultPosition, wxSize(wxDefaultSize.x, 100), 0, item9Strings, wxLB_SINGLE);
     item8->Add(item9, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* item10 = new wxBoxSizer(wxVERTICAL);
@@ -137,7 +146,7 @@ void ctConfigItemsSelector::CreateControls()
  * Event handler for ID_CONFIG_ADD
  */
 
-void ctConfigItemsSelector::OnConfigAdd( wxCommandEvent& event )
+void ctConfigItemsSelector::OnConfigAdd( wxCommandEvent& WXUNUSED(event) )
 {
     wxListBox* masterList = wxDynamicCast(FindWindow(ID_AVAILABLE_CONFIG_ITEMS), wxListBox);
     wxListBox* listBox = wxDynamicCast(FindWindow(ID_CONFIG_ITEMS), wxListBox);
@@ -159,7 +168,7 @@ void ctConfigItemsSelector::OnConfigAdd( wxCommandEvent& event )
  * Event handler for ID_CONFIG_REMOVE
  */
 
-void ctConfigItemsSelector::OnConfigRemove( wxCommandEvent& event )
+void ctConfigItemsSelector::OnConfigRemove( wxCommandEvent& WXUNUSED(event) )
 {
     wxListBox* listBox = wxDynamicCast(FindWindow(ID_CONFIG_ITEMS), wxListBox);
     if (listBox)
@@ -189,7 +198,7 @@ void ctConfigItemsSelector::OnOk( wxCommandEvent& event )
 
 bool ctConfigItemsSelector::ShowToolTips()
 {
-  return TRUE;
+  return true;
 }
 /*!
  * Update event handler for ID_CONFIG_ADD
@@ -221,22 +230,22 @@ void ctConfigItemsSelector::InitSourceConfigList(ctConfigItem* item)
     if (!item)
         return;
 
-    bool addIt = FALSE;
+    bool addIt = false;
 
     if (item->GetType() == ctTypeGroup)
-        addIt = FALSE;
+        addIt = false;
     else if (item->GetType() == ctTypeCheckGroup)
-        addIt = TRUE;
+        addIt = true;
     else if (item->GetType() == ctTypeRadioGroup)
-        addIt = TRUE;
+        addIt = true;
     else if (item->GetType() == ctTypeString)
-        addIt = TRUE;
+        addIt = true;
     else if (item->GetType() == ctTypeBoolCheck)
-        addIt = TRUE;
+        addIt = true;
     else if (item->GetType() == ctTypeBoolRadio)
-        addIt = TRUE;
+        addIt = true;
     else if (item->GetType() == ctTypeInteger)
-        addIt = TRUE;
+        addIt = true;
     if (addIt)
     {
         masterList->Append(item->GetName());
@@ -248,7 +257,7 @@ void ctConfigItemsSelector::InitSourceConfigList(ctConfigItem* item)
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         InitSourceConfigList(child);
 
-        node = node->Next();
+        node = node->GetNext();
     }
 }