Compilation fixes.

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

diff --git a/utils/configtool/src/custompropertydialog.cpp b/utils/configtool/src/custompropertydialog.cpp
index 9bf09e750a7a3e28fc7e35fe662d527cbb65081e..354956b4be5e7a9f666dbe8222f04b2e8f84ae02 100644 (file)
--- a/utils/configtool/src/custompropertydialog.cpp
+++ b/utils/configtool/src/custompropertydialog.cpp
@@ -236,7 +236,7 @@ void ctCustomPropertyDialog::OnPropertyChoiceRemove( wxCommandEvent& event )
     if (listBox->GetSelection() > -1)
     {
         listBox->Delete(listBox->GetSelection());
     if (listBox->GetSelection() > -1)
     {
         listBox->Delete(listBox->GetSelection());

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

     }
 }
 
     }
 }
 

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 917ad0b8b4fc42c171e7e581ca91625ffde3cabf..332c13518bbd174fd0887fd7cd27aef2f604818c 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -23,6 +23,7 @@
 #include "wx/notebook.h"
 #include "wx/splitter.h"
 #include "wx/clipbrd.h"
 #include "wx/notebook.h"
 #include "wx/splitter.h"
 #include "wx/clipbrd.h"

+#include "wx/dataobj.h"

 #include "wx/cshelp.h"
 
 #include "wxconfigtool.h"
 #include "wx/cshelp.h"
 
 #include "wxconfigtool.h"

diff --git a/utils/configtool/src/utils.h b/utils/configtool/src/utils.h
index 87fd2938361d1e1171c378a3180a58ff254e2212..587bc5b376385a62cf3983b1384cecfe448a0dd7 100644 (file)
--- a/utils/configtool/src/utils.h
+++ b/utils/configtool/src/utils.h
@@ -144,7 +144,7 @@ public:
     // enabled/disabled
     int GetStateCount() const { return m_maxStates; };
 
     // enabled/disabled
     int GetStateCount() const { return m_maxStates; };
 

-    void SetStateCount(int count) { m_maxStates; }
+    void SetStateCount(int count) { m_maxStates = count; }

     int GetIconId(int state, bool enabled = TRUE) const;
     void SetIconId(int state, bool enabled, int iconId);
 
     int GetIconId(int state, bool enabled = TRUE) const;
     void SetIconId(int state, bool enabled, int iconId);