removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called...

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

diff --git a/utils/configtool/src/custompropertydialog.cpp b/utils/configtool/src/custompropertydialog.cpp
index ef631a4474a01864147ba9d67c531826f3dca515..b002d67ced62c41618d24de213a0f4dc41c40769 100644 (file)
--- a/utils/configtool/src/custompropertydialog.cpp
+++ b/utils/configtool/src/custompropertydialog.cpp
@@ -9,8 +9,8 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation custompropertydialog.h
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "custompropertydialog.h"

 #endif
 
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>


@@ -70,14 +70,13 @@ ctCustomPropertyDialog::ctCustomPropertyDialog( wxWindow* parent, wxWindowID id,
  */
 
 void ctCustomPropertyDialog::CreateControls()
  */
 
 void ctCustomPropertyDialog::CreateControls()

-{    
+{

 ////@begin ctCustomPropertyDialog content construction
 
     ctCustomPropertyDialog* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
 ////@begin ctCustomPropertyDialog content construction
 
     ctCustomPropertyDialog* 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);
 
     wxBoxSizer* item3 = new wxBoxSizer(wxVERTICAL);
     item2->Add(item3, 1, wxGROW|wxALL, 5);


@@ -88,7 +87,7 @@ void ctCustomPropertyDialog::CreateControls()
     wxStaticText* item5 = new wxStaticText(item1, wxID_STATIC, _("&Name:"), wxDefaultPosition, wxDefaultSize, 0);
     item3->Add(item5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item5 = new wxStaticText(item1, wxID_STATIC, _("&Name:"), wxDefaultPosition, wxDefaultSize, 0);
     item3->Add(item5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 

-    wxTextCtrl* item6 = new wxTextCtrl(item1, ID_CUSTOMPROPERTYNAME, _(""), wxDefaultPosition, wxDefaultSize, 0);
+    wxTextCtrl* item6 = new wxTextCtrl(item1, ID_CUSTOMPROPERTYNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);

     item3->Add(item6, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* item7 = new wxBoxSizer(wxHORIZONTAL);
     item3->Add(item6, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* item7 = new wxBoxSizer(wxHORIZONTAL);


@@ -128,7 +127,7 @@ void ctCustomPropertyDialog::CreateControls()
     item13->SetStringSelection(_("string"));
     item11->Add(item13, 1, wxGROW|wxALL, 5);
 
     item13->SetStringSelection(_("string"));
     item11->Add(item13, 1, wxGROW|wxALL, 5);
 

-    wxStaticBox* item14Static = new wxStaticBox(item1, -1, _("Choices"));
+    wxStaticBox* item14Static = new wxStaticBox(item1, wxID_ANY, _("Choices"));

     wxStaticBoxSizer* item14 = new wxStaticBoxSizer(item14Static, wxHORIZONTAL);
     item3->Add(item14, 0, wxGROW|wxALL, 5);
 
     wxStaticBoxSizer* item14 = new wxStaticBoxSizer(item14Static, wxHORIZONTAL);
     item3->Add(item14, 0, wxGROW|wxALL, 5);
 


@@ -148,7 +147,7 @@ void ctCustomPropertyDialog::CreateControls()
     wxStaticText* item19 = new wxStaticText(item1, wxID_STATIC, _("&Description:"), wxDefaultPosition, wxDefaultSize, 0);
     item3->Add(item19, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item19 = new wxStaticText(item1, wxID_STATIC, _("&Description:"), wxDefaultPosition, wxDefaultSize, 0);
     item3->Add(item19, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 

-    wxTextCtrl* item20 = new wxTextCtrl(item1, ID_CUSTOMPROPERTYDESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_RICH);
+    wxTextCtrl* item20 = new wxTextCtrl(item1, ID_CUSTOMPROPERTYDESCRIPTION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_RICH);

     item3->Add(item20, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* item21 = new wxBoxSizer(wxHORIZONTAL);
     item3->Add(item20, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* item21 = new wxBoxSizer(wxHORIZONTAL);


@@ -183,7 +182,7 @@ void ctCustomPropertyDialog::CreateControls()
 
 bool ctCustomPropertyDialog::ShowToolTips()
 {
 
 bool ctCustomPropertyDialog::ShowToolTips()
 {

-  return TRUE;
+  return true;

 }
 
 /*!
 }
 
 /*!


@@ -200,7 +199,7 @@ void ctCustomPropertyDialog::OnUpdatePropertyChoices( wxUpdateUIEvent& event )
  * Event handler for ID_PROPERTY_CHOICE_ADD
  */
 
  * Event handler for ID_PROPERTY_CHOICE_ADD
  */
 

-void ctCustomPropertyDialog::OnPropertyChoiceAdd( wxCommandEvent& event )
+void ctCustomPropertyDialog::OnPropertyChoiceAdd( wxCommandEvent& WXUNUSED(event) )

 {
     wxChoice* choice = (wxChoice* ) FindWindow(ID_CUSTOMPROPERTYTYPE);
     if ( choice->GetSelection() > -1 && choice->GetStringSelection() == wxT("choice") )
 {
     wxChoice* choice = (wxChoice* ) FindWindow(ID_CUSTOMPROPERTYTYPE);
     if ( choice->GetSelection() > -1 && choice->GetStringSelection() == wxT("choice") )


@@ -229,14 +228,14 @@ void ctCustomPropertyDialog::OnUpdatePropertyChoiceAdd( wxUpdateUIEvent& event )
  * Event handler for ID_PROPERTY_CHOICE_REMOVE
  */
 
  * Event handler for ID_PROPERTY_CHOICE_REMOVE
  */
 

-void ctCustomPropertyDialog::OnPropertyChoiceRemove( wxCommandEvent& event )
+void ctCustomPropertyDialog::OnPropertyChoiceRemove( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    wxChoice* choice = (wxChoice* ) FindWindow(ID_CUSTOMPROPERTYEDITORTYPE);
+    /* wxChoice* choice = (wxChoice* ) */ FindWindow(ID_CUSTOMPROPERTYEDITORTYPE);

     wxListBox* listBox = (wxListBox* ) FindWindow(ID_PROPERTY_CHOICES);
     if (listBox->GetSelection() > -1)
     {
         listBox->Delete(listBox->GetSelection());
     wxListBox* listBox = (wxListBox* ) FindWindow(ID_PROPERTY_CHOICES);
     if (listBox->GetSelection() > -1)
     {
         listBox->Delete(listBox->GetSelection());

-        m_choices.Remove(listBox->GetSelection());
+        m_choices.RemoveAt(listBox->GetSelection());

     }
 }
 
     }
 }