Added window styles to wxToolBar handler.

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

diff --git a/utils/configtool/src/propeditor.cpp b/utils/configtool/src/propeditor.cpp
index 94220446def3d11ebeffda69692eaf0da5494b1e..d45415fe2fc6edfeeec03064e84611e36bc17c90 100644 (file)
--- 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
 
@@ -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"))
     {