fixed previous revision: call wxControl's, not wxButton's DoGetBestSize

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

diff --git a/utils/configtool/src/configitem.h b/utils/configtool/src/configitem.h
index 8ebba6932b575c9bffe22b30efcb001bd382ef4d..681c54a4690caecf168506ea47392843144ce1c2 100644 (file)
--- a/utils/configtool/src/configitem.h
+++ b/utils/configtool/src/configitem.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configitem.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        configitem.h

-// Purpose:     wxWindows Configuration Tool config item class
+// Purpose:     wxWidgets Configuration Tool config item class

 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-06-03


@@ -12,7 +12,7 @@
 #ifndef _CT_CONFIGITEM_H_
 #define _CT_CONFIGITEM_H_
 
 #ifndef _CT_CONFIGITEM_H_
 #define _CT_CONFIGITEM_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "configitem.cpp"
 #endif
 
 #pragma interface "configitem.cpp"
 #endif
 


@@ -179,19 +179,19 @@ public:
     bool IsModified() const { return m_modified; }
 
     /// Mark this as modified.
     bool IsModified() const { return m_modified; }
 
     /// Mark this as modified.

-    void Modify(bool modified = TRUE) { m_modified = modified; }
+    void Modify(bool modified = true) { m_modified = modified; }

 
     /// Is this item enabled? (checked/unchecked)
     bool IsEnabled() const { return m_enabled; }
 
     /// Enable or disable (check/uncheck)
 
     /// Is this item enabled? (checked/unchecked)
     bool IsEnabled() const { return m_enabled; }
 
     /// Enable or disable (check/uncheck)

-    void Enable(bool enable = TRUE) { m_enabled = enable; }
+    void Enable(bool enable = true) { m_enabled = enable; }

 
     /// Is this item active? (sensitive to user input)
     bool IsActive() const { return m_active; }
 
     /// Make this (in)active
 
     /// Is this item active? (sensitive to user input)
     bool IsActive() const { return m_active; }
 
     /// Make this (in)active

-    void SetActive(bool active = TRUE) { m_active = active; }
+    void SetActive(bool active = true) { m_active = active; }

 
     /// Set the type
     void SetType(ctConfigType type) { m_type = type; }
 
     /// Set the type
     void SetType(ctConfigType type) { m_type = type; }