fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/utils/configtool/src/propeditor.h b/utils/configtool/src/propeditor.h
index 5c20030688cf6886d9f0ec4499bc83aa8839866a..4ebf1f4dd8a548b452066073454adbc736415fa5 100644 (file)
--- a/utils/configtool/src/propeditor.h
+++ b/utils/configtool/src/propeditor.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        propeditor.cpp
-// Purpose:     Property editor for wxWindows configuration tool
+// Purpose:     Property editor for wxWidgets configuration tool
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
@@ -12,7 +12,7 @@
 #ifndef _CT_PROPEDITOR_H_
 #define _CT_PROPEDITOR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "propeditor.cpp"
 #endif
 
@@ -75,7 +75,7 @@ class ctPropertyEditor: public wxPanel
     void UpdateItem();
 
     /// Display attribute at given row
-    bool DisplayProperty(int row, ctProperty* prop, bool valueOnly = FALSE);
+    bool DisplayProperty(int row, ctProperty* prop, bool valueOnly = false);
 
     /// Display attribute value
     bool DisplayProperty(ctProperty* prop);
@@ -139,6 +139,8 @@ class ctPropertyEditor: public wxPanel
 DECLARE_EVENT_TABLE()
 
 protected:
+    // Dialog controls
+    wxButton*               m_attributeEditorEditDetails;
     ctPropertyEditorGrid*   m_attributeEditorGrid;
     wxHtmlWindow*           m_propertyDescriptionWindow;
     wxSplitterWindow*       m_splitterWindow;