get rid of public constants for various XRC defaults, there's no need for them outsid...

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

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 60aeb2d72a02e414ee375c6ad358d6f572d7b409..dbf135439528d9e6f008fa96eb354d6661be10ab 100644 (file)
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -169,20 +169,6 @@ public:
     /** Destructor */
     virtual ~wxPropertyGridInterface() { }
 
     /** Destructor */
     virtual ~wxPropertyGridInterface() { }
 

-    /** Adds choice to a property that can accept one.
-        @remarks
-        - If you need to make sure that you modify only the set of choices of
-          a single property (and not also choices of other properties with
-          initially identical set), call
-          wxPropertyGrid::SetPropertyChoicesPrivate.
-        - This usually only works for wxEnumProperty and derivatives
-          (wxFlagsProperty can get accept new items but its items may not get
-          updated).
-    */
-    void AddPropertyChoice( wxPGPropArg id,
-                            const wxString& label,
-                            int value = wxPG_INVALID_VALUE );
-

     /**
         Appends property to the list.
 
     /**
         Appends property to the list.
 


@@ -263,14 +249,6 @@ public:
      */
     void DeleteProperty( wxPGPropArg id );
 
      */
     void DeleteProperty( wxPGPropArg id );
 

-    /** Deletes choice from a property.
-
-        If selected item is deleted, then the value is set to unspecified.
-
-        See AddPropertyChoice for more details.
-    */
-    void DeletePropertyChoice( wxPGPropArg id, int index );
-

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


@@ -463,12 +441,6 @@ public:
     wxPGProperty* GetPropertyByName( const wxString& name,
                                      const wxString& subname ) const;
 
     wxPGProperty* GetPropertyByName( const wxString& name,
                                      const wxString& subname ) const;
 

-    /** Returns writable reference to property's list of choices (and relevant
-        values). If property does not have any choices, will return reference
-        to an invalid set of choices that will return false on IsOk call.
-    */
-    wxPGChoices& GetPropertyChoices( wxPGPropArg id );
-

     /** Returns property's editor. */
     const wxPGEditor* GetPropertyEditor( wxPGPropArg id ) const
     {
     /** Returns property's editor. */
     const wxPGEditor* GetPropertyEditor( wxPGPropArg id ) const
     {


@@ -490,13 +462,6 @@ public:
         return p->GetValueImage();
     }
 
         return p->GetValueImage();
     }
 

-    /** Returns property's position under its parent. */
-    unsigned int GetPropertyIndex( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(INT_MAX)
-        return p->GetIndexInParent();
-    }
-

     /** Returns label of a property. */
     const wxString& GetPropertyLabel( wxPGPropArg id )
     {
     /** Returns label of a property. */
     const wxString& GetPropertyLabel( wxPGPropArg id )
     {


@@ -505,10 +470,9 @@ public:
     }
 
     /** Returns name of a property, by which it is globally accessible. */
     }
 
     /** Returns name of a property, by which it is globally accessible. */

-    wxString GetPropertyName( wxPGPropArg id )
+    wxString GetPropertyName( wxPGProperty* property )

     {
     {

-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_emptyString)
-        return p->GetName();
+        return property->GetName();

     }
 
     /** Returns parent item of a property. */
     }
 
     /** Returns parent item of a property. */


@@ -552,7 +516,6 @@ public:
 #endif
     bool GetPropertyValueAsBool( wxPGPropArg id ) const;
     double GetPropertyValueAsDouble( wxPGPropArg id ) const;
 #endif
     bool GetPropertyValueAsBool( wxPGPropArg id ) const;
     double GetPropertyValueAsDouble( wxPGPropArg id ) const;

-    void* GetPropertyValueAsVoidPtr( wxPGPropArg id ) const;

 
 #define wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL(TYPENAME, DEFVAL) \
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(DEFVAL) \
 
 #define wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL(TYPENAME, DEFVAL) \
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(DEFVAL) \


@@ -577,22 +540,7 @@ public:
         return value.GetArrayString();
     }
 
         return value.GetArrayString();
     }
 

-    wxPoint GetPropertyValueAsPoint( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL("wxPoint", wxPoint())
-        wxPoint pt;
-        pt << value;
-        return pt;
-    }
-
-    wxSize GetPropertyValueAsSize( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL("wxSize", wxSize())
-        wxSize sz;
-        sz << value;
-        return sz;
-    }
-
+#if wxUSE_LONGLONG_NATIVE

     wxLongLong_t GetPropertyValueAsLongLong( wxPGPropArg id ) const
     {
         wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL_WFALLBACK("wxLongLong",
     wxLongLong_t GetPropertyValueAsLongLong( wxPGPropArg id ) const
     {
         wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL_WFALLBACK("wxLongLong",


@@ -610,6 +558,7 @@ public:
         ull << value;
         return ull.GetValue();
     }
         ull << value;
         return ull.GetValue();
     }

+#endif

 
     wxArrayInt GetPropertyValueAsArrayInt( wxPGPropArg id ) const
     {
 
     wxArrayInt GetPropertyValueAsArrayInt( wxPGPropArg id ) const
     {


@@ -647,12 +596,6 @@ public:
     }
 #endif
 
     }
 #endif
 

-    wxString GetPropertyValueType( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_emptyString)
-        return p->GetValueType();
-    }
-

     /** Returns currently selected property. */
     wxPGProperty* GetSelection() const
     {
     /** Returns currently selected property. */
     wxPGProperty* GetSelection() const
     {


@@ -762,15 +705,6 @@ public:
         return p->IsCategory();
     }
 
         return p->IsCategory();
     }
 

-    /** Inserts choice to a property that can accept one.
-
-        See AddPropertyChoice for more details.
-    */
-    void InsertPropertyChoice( wxPGPropArg id,
-                               const wxString& label,
-                               int index,
-                               int value = wxPG_INVALID_VALUE );
-

     /** Returns true if property is enabled. */
     bool IsPropertyEnabled( wxPGPropArg id ) const
     {
     /** Returns true if property is enabled. */
     bool IsPropertyEnabled( wxPGPropArg id ) const
     {


@@ -945,6 +879,12 @@ public:
         DoSetPropertyAttribute(id,attrName,value,argFlags);
     }
 
         DoSetPropertyAttribute(id,attrName,value,argFlags);
     }
 

+    /** Sets property attribute for all applicapple properties.
+        Be sure to use this method only after all properties have been
+        added to the grid.
+    */
+    void SetPropertyAttributeAll( const wxString& attrName, wxVariant value );
+

     /** Sets attributes from a wxPGAttributeStorage.
     */
     void SetPropertyAttributes( wxPGPropArg id,
     /** Sets attributes from a wxPGAttributeStorage.
     */
     void SetPropertyAttributes( wxPGPropArg id,


@@ -971,28 +911,6 @@ public:
         p->SetCell( column, new wxPGCell(text, bitmap, fgCol, bgCol) );
     }
 
         p->SetCell( column, new wxPGCell(text, bitmap, fgCol, bgCol) );
     }
 

-    /** Set choices of a property to specified set of labels and values.
-
-        @remarks
-        This operation clears the property value.
-    */
-    void SetPropertyChoices( wxPGPropArg id, wxPGChoices& choices)
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetChoices(choices);
-    }
-
-
-    /**
-        If property's set of choices is shared, then calling this method
-        converts it to private.
-    */
-    void SetPropertyChoicesExclusive( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetChoicesExclusive();
-    }
-

 #ifndef SWIG
     /** Sets client data (void*) of a property.
         @remarks
 #ifndef SWIG
     /** Sets client data (void*) of a property.
         @remarks


@@ -1043,6 +961,21 @@ public:
         p->SetModifiedStatus(modified);
     }
 
         p->SetModifiedStatus(modified);
     }
 

+    /**
+        Sets name of a property.
+
+        @param id
+            Name or pointer of property which name to change.
+
+        @param newName
+            New name for property.
+    */
+    void SetPropertyName( wxPGPropArg id, const wxString& newName )
+    {
+        wxPG_PROP_ARG_CALL_PROLOG()
+        m_pState->DoSetPropertyName( p, newName );
+    }
+

     /**
         Sets property (and, recursively, its children) to have read-only value.
         In other words, user cannot change the value in the editor, but they
     /**
         Sets property (and, recursively, its children) to have read-only value.
         In other words, user cannot change the value in the editor, but they


@@ -1161,7 +1094,13 @@ public:
         wxVariant v(value);
         SetPropVal( id, v );
     }
         wxVariant v(value);
         SetPropVal( id, v );
     }

-    void SetPropertyValue( wxPGPropArg id, const wxChar* value )
+#if wxUSE_WCHAR_T
+    void SetPropertyValue( wxPGPropArg id, const wchar_t* value )
+    {
+        SetPropertyValueString( id, wxString(value) );
+    }
+#endif
+    void SetPropertyValue( wxPGPropArg id, const char* value )

     {
         SetPropertyValueString( id, wxString(value) );
     }
     {
         SetPropertyValueString( id, wxString(value) );
     }


@@ -1200,20 +1139,7 @@ public:
         SetPropVal( id, v );
     }
 
         SetPropVal( id, v );
     }
 

-    /** Sets value (wxPoint&) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, const wxPoint& value )
-    {
-        wxVariant v = WXVARIANT(value);
-        SetPropVal( id, v );
-    }
-    /** Sets value (wxSize&) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, const wxSize& value )
-    {
-        wxVariant v = WXVARIANT(value);
-        SetPropVal( id, v );
-    }
+#if wxUSE_LONGLONG_NATIVE

     /** Sets value (wxLongLong&) of a property.
     */
     void SetPropertyValue( wxPGPropArg id, wxLongLong_t value )
     /** Sets value (wxLongLong&) of a property.
     */
     void SetPropertyValue( wxPGPropArg id, wxLongLong_t value )


@@ -1228,6 +1154,8 @@ public:
         wxVariant v = WXVARIANT(wxULongLong(value));
         SetPropVal( id, v );
     }
         wxVariant v = WXVARIANT(wxULongLong(value));
         SetPropVal( id, v );
     }

+#endif
+

     /** Sets value (wxArrayInt&) of a property.
     */
     void SetPropertyValue( wxPGPropArg id, const wxArrayInt& value )
     /** Sets value (wxArrayInt&) of a property.
     */
     void SetPropertyValue( wxPGPropArg id, const wxArrayInt& value )