X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b512ed93206f70d502c52df705cad47c3ba2cc7f..ba5619e07600355a9823f9d2dcfab56cdcbbfb07:/include/wx/propgrid/editors.h diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h index cf81fcee2b..e953f7a7fe 100644 --- a/include/wx/propgrid/editors.h +++ b/include/wx/propgrid/editors.h @@ -30,7 +30,6 @@ public: wxWindow* m_primary; wxWindow* m_secondary; -#ifndef SWIG wxPGWindowList( wxWindow* a ) { m_primary = a; @@ -41,7 +40,6 @@ public: m_primary = a; m_secondary = b; }; -#endif }; // ----------------------------------------------------------------------- @@ -153,7 +151,6 @@ public: virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, wxWindow* wnd_primary, wxEvent& event ) const = 0; -#if !defined(SWIG) || defined(CREATE_VCW) /** Returns value from control, via parameter 'variant'. Usually ends up calling property's StringToValue or IntToValue. Returns true if value was different. @@ -161,11 +158,36 @@ public: virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const; -#endif - /** Sets value in control to unspecified. */ + /** + Sets new appearance for the control. Default implementation + sets foreground colour, background colour, font, plus text + for wxTextCtrl and wxComboCtrl. + + @param appearance + New appearance to be applied. + + @param oldAppearance + Previously applied appearance. Used to detect which + control attributes need to be changed (e.g. so we only + change background colour if really needed). + + @param unspecified + @true if the new appearance represents an unspecified + property value. + */ + virtual void SetControlAppearance( wxPropertyGrid* pg, + wxPGProperty* property, + wxWindow* ctrl, + const wxPGCell& appearance, + const wxPGCell& oldAppearance, + bool unspecified ) const; + + /** + Sets value in control to unspecified. + */ virtual void SetValueToUnspecified( wxPGProperty* property, - wxWindow* ctrl ) const = 0; + wxWindow* ctrl ) const; /** Sets control's value specifically from string. */ virtual void SetControlStringValue( wxPGProperty* property, @@ -239,8 +261,6 @@ public: virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const; - virtual void SetValueToUnspecified( wxPGProperty* property, - wxWindow* ctrl ) const; virtual wxString GetName() const; @@ -339,9 +359,6 @@ public: }; -// Exclude classes from being able to be derived from in wxPython bindings -#ifndef SWIG - class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor { public: @@ -373,8 +390,6 @@ public: DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor) }; -#endif // !SWIG - #if wxPG_INCLUDE_CHECKBOX @@ -495,6 +510,7 @@ class WXDLLIMPEXP_PROPGRID wxPGMultiButton : public wxWindow { public: wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz ); + virtual ~wxPGMultiButton() {} wxWindow* GetButton( unsigned int i ) { return (wxWindow*) m_buttons[i]; } const wxWindow* GetButton( unsigned int i ) const