Correct checks for wxUSE_PRINTING_ARCHITECTURE and wxUSE_ENH_METAFILE.

[wxWidgets.git] / include / wx / propgrid / propgridiface.h

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index d68fa7abe85d15cafd799e69ad9f4d4bcca4597b..5be24550c7396b73a02d22b51b5554c8a989694c 100644 (file)
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -6,12 +6,14 @@
 // Created:     2008-08-24
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Created:     2008-08-24
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_PROPGRID_PROPGRIDIFACE_H__
 #define __WX_PROPGRID_PROPGRIDIFACE_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_PROPGRID_PROPGRIDIFACE_H__
 #define __WX_PROPGRID_PROPGRIDIFACE_H__
 

+#include "wx/defs.h"
+

 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"


@@ -267,7 +269,11 @@ public:
     */
     wxPGProperty* RemoveProperty( wxPGPropArg id );
 
     */
     wxPGProperty* RemoveProperty( wxPGPropArg id );
 

-    /** Disables property. */
+    /**
+        Disables a property.
+
+        @see EnableProperty(), wxPGProperty::Enable()
+    */

     bool DisableProperty( wxPGPropArg id ) { return EnableProperty(id,false); }
 
     /**
     bool DisableProperty( wxPGPropArg id ) { return EnableProperty(id,false); }
 
     /**


@@ -280,7 +286,14 @@ public:
 
     /**
         Enables or disables property, depending on whether enable is true or
 
     /**
         Enables or disables property, depending on whether enable is true or

-        false.
+        false. Disabled property usually appears as having grey text.
+
+        @param id
+            Name or pointer to a property.
+        @param enable
+            If @false, property is disabled instead.
+
+        @see wxPGProperty::Enable()

      */
     bool EnableProperty( wxPGPropArg id, bool enable = true );
 
      */
     bool EnableProperty( wxPGPropArg id, bool enable = true );
 


@@ -1372,7 +1385,8 @@ private:
     {
         if ( !m_pState )
             return NULL;
     {
         if ( !m_pState )
             return NULL;

-        return static_cast<const wxPropertyGrid*>(m_pState->GetGrid());
+
+        return m_pState->GetGrid();

     }
 
     friend class wxPropertyGrid;
     }
 
     friend class wxPropertyGrid;