X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7463f75f9c170c29b4965d27dccf535ac32cfde..04633c190f5a6eafe607a5712647aaa131522b1f:/utils/configtool/src/propeditor.cpp?ds=sidebyside

diff --git a/utils/configtool/src/propeditor.cpp b/utils/configtool/src/propeditor.cpp
index a9fbb9f54e..d45415fe2f 100644
--- a/utils/configtool/src/propeditor.cpp
+++ b/utils/configtool/src/propeditor.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "propeditor.h"
 #endif
 
@@ -163,7 +163,7 @@ void ctPropertyEditor::ClearEditor()
 }
 
 /// Handles detailed editing event.
-void ctPropertyEditor::OnEditDetails(wxCommandEvent& event)
+void ctPropertyEditor::OnEditDetails(wxCommandEvent& WXUNUSED(event))
 {
     wxWindow* parentFrame = this;
     while (parentFrame && !parentFrame->IsKindOf(CLASSINFO(wxFrame)))
@@ -313,12 +313,16 @@ bool ctPropertyEditor::DisplayProperty(int row, ctProperty* prop, bool valueOnly
     // Set the value type
     if (prop->GetEditorType() == _T("choice"))
     {
+#if 0
         wxString* strArr = prop->GetChoices().GetStringArray();
 
         m_attributeEditorGrid->SetCellEditor(row, 1,
                 new wxGridCellChoiceEditor(prop->GetChoices().GetCount(), strArr));
 
         delete[] strArr;
+#endif
+        m_attributeEditorGrid->SetCellEditor(row, 1,
+                new wxGridCellChoiceEditor(prop->GetChoices()));
     }
     else if (prop->GetEditorType() == _T("integer") || prop->GetVariant().GetType() == _T("long"))
     {
@@ -435,7 +439,7 @@ ctProperty* ctPropertyEditor::FindProperty(int row)
 }
 
 /// Edit the details of this cell appropriately.
-bool ctPropertyEditor::EditDetails(wxWindow* parent)
+bool ctPropertyEditor::EditDetails(wxWindow* WXUNUSED(parent))
 {
     if (CanEditDetails())
     {
@@ -572,7 +576,7 @@ void ctPropertyEditor::OnChangeCell(wxGridEvent& event)
 }
 
 /// Double-click to show specialised editor.
-void ctPropertyEditor::OnDClickCell(wxGridEvent& event)
+void ctPropertyEditor::OnDClickCell(wxGridEvent& WXUNUSED(event))
 {
     wxWindow* parentFrame = this;
     while (parentFrame && !parentFrame->IsKindOf(CLASSINFO(wxFrame)))