make wxFileName::{Mk,Rm}dir() const (closes #10868)

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

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 93f0ed542d6900931f8b4176dfaef53dc15af14b..53f4db9b7c8e8382f7c2a3dbcc6b4954f8e859ad 100644 (file)
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -534,9 +534,9 @@ public:
     virtual bool StringToValue( wxVariant& variant,
                                 const wxString& text,
                                 int flags ) const;
     virtual bool StringToValue( wxVariant& variant,
                                 const wxString& text,
                                 int flags ) const;

-    virtual void ChildChanged( wxVariant& thisValue,
-                               int childIndex,
-                               wxVariant& childValue ) const;
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;

     virtual void RefreshChildren();
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 
     virtual void RefreshChildren();
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 


@@ -696,9 +696,7 @@ protected:
 */
 class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxLongStringProperty
 {
 */
 class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxLongStringProperty
 {

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS(wxDirProperty)
     DECLARE_DYNAMIC_CLASS(wxDirProperty)

-#endif

 public:
     wxDirProperty( const wxString& name = wxPG_LABEL,
                    const wxString& label = wxPG_LABEL,
 public:
     wxDirProperty( const wxString& name = wxPG_LABEL,
                    const wxString& label = wxPG_LABEL,


@@ -954,10 +952,8 @@ protected:
     virtual void ArraySwap( size_t first, size_t second ) = 0;
 
 private:
     virtual void ArraySwap( size_t first, size_t second ) = 0;
 
 private:

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayEditorDialog)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayEditorDialog)
     DECLARE_EVENT_TABLE()

-#endif

 };
 
 // -----------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------


@@ -1004,10 +1000,8 @@ protected:
     virtual void ArraySwap( size_t first, size_t second );
 
 private:
     virtual void ArraySwap( size_t first, size_t second );
 
 private:

-#ifndef SWIG

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog)
     DECLARE_EVENT_TABLE()

-#endif

 };
 
 // -----------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------