remove mentions of wxEVENTS_COMPATIBILITY_2_8

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

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 250acb8bb58d5cf5c085bd057b0e0fea2b520ac2..9326cc40b99a68ffa91068350f879ac19888b88a 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -23,8 +23,6 @@
 // Additional Value Type Handlers
 //
 #ifndef SWIG
 // Additional Value Type Handlers
 //
 #ifndef SWIG

-bool WXDLLIMPEXP_PROPGRID operator==(const wxFont&, const wxFont&);
-

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


@@ -128,7 +126,8 @@ public:
 #ifndef SWIG
     void operator=(const wxColourPropertyValue& cpv)
     {
 #ifndef SWIG
     void operator=(const wxColourPropertyValue& cpv)
     {

-        Init( cpv.m_type, cpv.m_colour );
+        if (this != &cpv)
+            Init( cpv.m_type, cpv.m_colour );

     }
 
 private:
     }
 
 private:


@@ -146,7 +145,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
 #endif
 
 #ifndef SWIG
 #endif
 
 #ifndef SWIG

-    #define wxPG_EMPTY_CPV          (*((wxColourPropertyValue*)NULL))
+    #define wxPG_EMPTY_CPV          (*(NULL))

     #define wxPG_NORMAL_FONT        (*wxNORMAL_FONT)
 #else
     #define wxPG_EMPTY_CPV          wxCPV_wxPG_EMPTY
     #define wxPG_NORMAL_FONT        (*wxNORMAL_FONT)
 #else
     #define wxPG_EMPTY_CPV          wxCPV_wxPG_EMPTY


@@ -291,9 +290,10 @@ public:
                       const wxColour& value = *wxWHITE );
     virtual ~wxColourProperty();
 
                       const wxColour& value = *wxWHITE );
     virtual ~wxColourProperty();
 

-protected:

     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual wxColour GetColour( int index ) const;
     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual wxColour GetColour( int index ) const;

+
+protected:

     virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
 
 private:
     virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
 
 private:


@@ -406,7 +406,7 @@ public:
 
 protected:
 
 
 protected:
 

-    void GenerateValueAsString( wxString* target ) const;
+    void GenerateValueAsString( wxVariant& value, wxString* target ) const;

 
     // Returns translation of values into string indices.
     wxArrayInt GetValueAsIndices() const;
 
     // Returns translation of values into string indices.
     wxArrayInt GetValueAsIndices() const;


@@ -430,7 +430,8 @@ 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.
+       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE 
+       enables additional support for unspecified property value.

 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty
 {
 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty
 {


@@ -442,6 +443,7 @@ public:
                     const wxDateTime& value = wxDateTime() );
     virtual ~wxDateProperty();
 
                     const wxDateTime& value = wxDateTime() );
     virtual ~wxDateProperty();
 

+    virtual void OnSetValue();

     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual bool StringToValue(wxVariant& variant,
                                const wxString& text,
     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual bool StringToValue(wxVariant& variant,
                                const wxString& text,