compilation fix for wxUSE_IMAGE=0 case

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

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 94d8b500657fcb3ad7a7f8cb82696bfa34643076..9ec2776a80e421bf74b22acc99ad65ea431d1901 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -818,7 +818,7 @@ public:
         @param values
             Values for choices. If NULL, indexes are used.
     */
         @param values
             Values for choices. If NULL, indexes are used.
     */

-    wxPGChoices( const wxChar** labels, const long* values = NULL )
+    wxPGChoices( const wxChar* const* labels, const long* values = NULL )

     {
         Init();
         Set(labels,values);
     {
         Init();
         Set(labels,values);


@@ -866,7 +866,7 @@ public:
         @param values
             Values for added choices. If empty, relevant entry indexes are used.
     */
         @param values
             Values for added choices. If empty, relevant entry indexes are used.
     */

-    void Add( const wxChar** labels, const ValArrItem* values = NULL );
+    void Add( const wxChar* const* labels, const ValArrItem* values = NULL );

 
     /** Version that works with wxArrayString and wxArrayInt. */
     void Add( const wxArrayString& arr, const wxArrayInt& arrint = wxArrayInt() );
 
     /** Version that works with wxArrayString and wxArrayInt. */
     void Add( const wxArrayString& arr, const wxArrayInt& arrint = wxArrayInt() );


@@ -994,7 +994,7 @@ public:
 
 #ifndef SWIG
     /** Does not create copies for itself. */
 
 #ifndef SWIG
     /** Does not create copies for itself. */

-    void Set( const wxChar** labels, const long* values = NULL )
+    void Set( const wxChar* const* labels, const long* values = NULL )

     {
         Free();
         Add(labels,values);
     {
         Free();
         Add(labels,values);


@@ -2043,7 +2043,7 @@ public:
     void SetValueToUnspecified()
     {
         wxVariant val;  // Create NULL variant
     void SetValueToUnspecified()
     {
         wxVariant val;  // Create NULL variant

-        SetValue(val);
+        SetValue(val, NULL, wxPG_SETVAL_REFRESH_EDITOR);

     }
 
     // Helper function (for wxPython bindings and such) for settings protected
     }
 
     // Helper function (for wxPython bindings and such) for settings protected


@@ -2067,7 +2067,7 @@ public:
             return m_validator;
         return DoGetValidator();
     }
             return m_validator;
         return DoGetValidator();
     }

-#endif // #if wxUSE_VALIDATORS
+#endif // wxUSE_VALIDATORS

 
 #ifndef SWIG
     /** Returns client data (void*) of a property.
 
 #ifndef SWIG
     /** Returns client data (void*) of a property.