move virtual GetPath() implementation out of line to work around an apparent Fedora...

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

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index cd879699d0a5abe00f1938f4026327cf2edca5be..9326cc40b99a68ffa91068350f879ac19888b88a 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////


@@ -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


@@ -84,6 +82,7 @@ public:
     wxColour    m_colour;
 
     wxColourPropertyValue()
     wxColour    m_colour;
 
     wxColourPropertyValue()

+        : wxObject()

     {
         m_type = 0;
     }
     {
         m_type = 0;
     }


@@ -93,6 +92,7 @@ public:
     }
 
     wxColourPropertyValue( const wxColourPropertyValue& v )
     }
 
     wxColourPropertyValue( const wxColourPropertyValue& v )

+        : wxObject()

     {
         m_type = v.m_type;
         m_colour = v.m_colour;
     {
         m_type = v.m_type;
         m_colour = v.m_colour;


@@ -105,17 +105,20 @@ public:
     }
 
     wxColourPropertyValue( const wxColour& colour )
     }
 
     wxColourPropertyValue( const wxColour& colour )

+        : wxObject()

     {
         m_type = wxPG_COLOUR_CUSTOM;
         m_colour = colour;
     }
 
     wxColourPropertyValue( wxUint32 type )
     {
         m_type = wxPG_COLOUR_CUSTOM;
         m_colour = colour;
     }
 
     wxColourPropertyValue( wxUint32 type )

+        : wxObject()

     {
         m_type = type;
     }
 
     wxColourPropertyValue( wxUint32 type, const wxColour& colour )
     {
         m_type = type;
     }
 
     wxColourPropertyValue( wxUint32 type, const wxColour& colour )

+        : wxObject()

     {
         Init( type, colour );
     }
     {
         Init( type, colour );
     }


@@ -123,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:


@@ -141,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


@@ -175,7 +179,7 @@ public:
                    const wxFont& value = wxFont());
     virtual ~wxFontProperty();
     virtual void OnSetValue();
                    const wxFont& value = wxFont());
     virtual ~wxFontProperty();
     virtual void OnSetValue();

-    virtual wxString GetValueAsString( int argFlags = 0 ) const;
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;

     virtual bool OnEvent( wxPropertyGrid* propgrid,
                           wxWindow* primary, wxEvent& event );
     virtual void ChildChanged( wxVariant& thisValue,
     virtual bool OnEvent( wxPropertyGrid* propgrid,
                           wxWindow* primary, wxEvent& event );
     virtual void ChildChanged( wxVariant& thisValue,


@@ -226,7 +230,7 @@ public:
     */
     virtual int GetCustomColourIndex() const;
 
     */
     virtual int GetCustomColourIndex() const;
 

-    virtual wxString GetValueAsString( int argFlags = 0 ) const;
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;

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


@@ -277,14 +281,30 @@ protected:
 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 

-WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR_WITH_DECL(
-    wxColourProperty, class WXDLLIMPEXP_PROPGRID)
+class WXDLLIMPEXP_PROPGRID wxColourProperty : public wxSystemColourProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxColourProperty)
+public:
+    wxColourProperty( const wxString& label = wxPG_LABEL,
+                      const wxString& name = wxPG_LABEL,
+                      const wxColour& value = *wxWHITE );
+    virtual ~wxColourProperty();

 
 

-// Exclude classes from wxPython bindings
-#ifndef SWIG
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual wxColour GetColour( int index ) const;
+
+protected:
+    virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
+
+private:
+    void Init( wxColour colour );
+};

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

+// Exclude classes from wxPython bindings
+#ifndef SWIG
+

 /** @class wxCursorProperty
     @ingroup classes
     Property representing wxCursor.
 /** @class wxCursorProperty
     @ingroup classes
     Property representing wxCursor.


@@ -372,7 +392,7 @@ public:
     virtual ~wxMultiChoiceProperty();
 
     virtual void OnSetValue();
     virtual ~wxMultiChoiceProperty();
 
     virtual void OnSetValue();

-    virtual wxString GetValueAsString( int flags = 0 ) const;
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;

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


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

-    void GenerateValueAsString();
+    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;


@@ -410,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
 {


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

-    virtual wxString GetValueAsString( int flags = 0 ) const;
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;

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


@@ -494,13 +516,15 @@ protected:
 //   used for event handling here.
 class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
 {
 //   used for event handling here.
 class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
 {

-    WX_PG_DECLARE_EDITOR_CLASS(wxPGSpinCtrlEditor)
+    DECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor)

 public:
     virtual ~wxPGSpinCtrlEditor();
 
 public:
     virtual ~wxPGSpinCtrlEditor();
 

-    // See below for short explanations of what these are suppposed to do.
-    wxPG_DECLARE_CREATECONTROLS
-
+    wxString GetName() const;
+    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
+                                          wxPGProperty* property,
+                                          const wxPoint& pos,
+                                          const wxSize& size) const;

     virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
         wxWindow* wnd, wxEvent& event ) const;
 
     virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
         wxWindow* wnd, wxEvent& event ) const;