Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

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

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 9326cc40b99a68ffa91068350f879ac19888b88a..388eb9349a4fe8e7acfd0d9b6e007660fa09312f 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -19,14 +19,13 @@
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 
 

+#ifndef SWIG
+

 //
 // Additional Value Type Handlers
 //
 //
 // Additional Value Type Handlers
 //

-#ifndef SWIG

 bool WXDLLIMPEXP_PROPGRID
 operator==(const wxArrayInt& array1, const wxArrayInt& array2);
 bool WXDLLIMPEXP_PROPGRID
 operator==(const wxArrayInt& array1, const wxArrayInt& array2);

-#endif
-

 
 //
 // Additional Property Editors
 
 //
 // Additional Property Editors


@@ -39,6 +38,8 @@ WX_PG_DECLARE_EDITOR_WITH_DECL(SpinCtrl,WXDLLIMPEXP_PROPGRID)
 WX_PG_DECLARE_EDITOR_WITH_DECL(DatePickerCtrl,WXDLLIMPEXP_PROPGRID)
 #endif
 
 WX_PG_DECLARE_EDITOR_WITH_DECL(DatePickerCtrl,WXDLLIMPEXP_PROPGRID)
 #endif
 

+#endif  // !SWIG
+

 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 
 


@@ -156,7 +157,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
 // -----------------------------------------------------------------------
 // Declare part of custom colour property macro pairs.
 
 // -----------------------------------------------------------------------
 // Declare part of custom colour property macro pairs.
 

-#if wxUSE_IMAGE || defined(SWIG)
+#if wxUSE_IMAGE

     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 


@@ -182,8 +183,9 @@ public:
     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual bool OnEvent( wxPropertyGrid* propgrid,
                           wxWindow* primary, wxEvent& event );
     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual bool OnEvent( wxPropertyGrid* propgrid,
                           wxWindow* primary, wxEvent& event );

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

     virtual void RefreshChildren();
 
 protected:
     virtual void RefreshChildren();
 
 protected:


@@ -255,10 +257,10 @@ protected:
 
     // Special constructors to be used by derived classes.
     wxSystemColourProperty( const wxString& label, const wxString& name,
 
     // Special constructors to be used by derived classes.
     wxSystemColourProperty( const wxString& label, const wxString& name,

-        const wxChar** labels, const long* values, wxPGChoices* choicesCache,
+        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,

         const wxColourPropertyValue& value );
     wxSystemColourProperty( const wxString& label, const wxString& name,
         const wxColourPropertyValue& value );
     wxSystemColourProperty( const wxString& label, const wxString& name,

-        const wxChar** labels, const long* values, wxPGChoices* choicesCache,
+        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,

         const wxColour& value );
 
     void Init( int type, const wxColour& colour );
         const wxColour& value );
 
     void Init( int type, const wxColour& colour );


@@ -356,7 +358,7 @@ protected:
 
 #endif
 
 
 #endif
 

-#if wxUSE_CHOICEDLG || defined(SWIG)
+#if wxUSE_CHOICEDLG

 
 /** @class wxMultiChoiceProperty
     @ingroup classes
 
 /** @class wxMultiChoiceProperty
     @ingroup classes


@@ -430,7 +432,7 @@ protected:
     <b>Supported special attributes:</b>
     - "DateFormat": Determines displayed date format.
     - "PickerStyle": Determines window style used with wxDatePickerCtrl.
     <b>Supported special attributes:</b>
     - "DateFormat": Determines displayed date format.
     - "PickerStyle": Determines window style used with wxDatePickerCtrl.

-       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE 
+       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE

        enables additional support for unspecified property value.
 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty
        enables additional support for unspecified property value.
 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty