more use of wxOVERRIDE
This commit is contained in:
Paul Cornett
@@ -158,14 +158,14 @@ public:
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxFont& value = wxFont());
|
||||
virtual ~wxFontProperty();
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
|
||||
virtual wxVariant ChildChanged( wxVariant& thisValue,
|
||||
int childIndex,
|
||||
wxVariant& childValue ) const;
|
||||
virtual void RefreshChildren();
|
||||
wxVariant& childValue ) const wxOVERRIDE;
|
||||
virtual void RefreshChildren() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
};
|
||||
@@ -193,10 +193,10 @@ public:
|
||||
value = wxColourPropertyValue() );
|
||||
virtual ~wxSystemColourProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual bool IntToValue(wxVariant& variant,
|
||||
int number,
|
||||
int argFlags = 0) const;
|
||||
int argFlags = 0) const wxOVERRIDE;
|
||||
|
||||
/**
|
||||
Override in derived class to customize how colours are printed as
|
||||
@@ -210,16 +210,16 @@ public:
|
||||
*/
|
||||
virtual int GetCustomColourIndex() const;
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
|
||||
|
||||
// Helper function to show the colour dialog
|
||||
bool QueryColourFromUser( wxVariant& variant ) const;
|
||||
@@ -270,11 +270,11 @@ public:
|
||||
const wxColour& value = *wxWHITE );
|
||||
virtual ~wxColourProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxColour GetColour( int index ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual wxColour GetColour( int index ) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
|
||||
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void Init( wxColour colour );
|
||||
@@ -295,9 +295,9 @@ class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
|
||||
int value = 0 );
|
||||
virtual ~wxCursorProperty();
|
||||
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -320,11 +320,11 @@ public:
|
||||
const wxString& value = wxEmptyString);
|
||||
virtual ~wxImageFileProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxBitmap* m_pBitmap; // final thumbnail area
|
||||
@@ -371,13 +371,13 @@ public:
|
||||
|
||||
virtual ~wxMultiChoiceProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue(wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0) const;
|
||||
int argFlags = 0) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
|
||||
|
||||
wxArrayInt GetValueAsArrayInt() const
|
||||
{
|
||||
@@ -423,13 +423,13 @@ public:
|
||||
const wxDateTime& value = wxDateTime() );
|
||||
virtual ~wxDateProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue(wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0) const;
|
||||
int argFlags = 0) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
|
||||
void SetFormat( const wxString& format )
|
||||
{
|
||||
@@ -498,13 +498,13 @@ class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
|
||||
public:
|
||||
virtual ~wxPGSpinCtrlEditor();
|
||||
|
||||
wxString GetName() const;
|
||||
wxString GetName() const wxOVERRIDE;
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
|
||||
wxWindow* wnd, wxEvent& event ) const;
|
||||
wxWindow* wnd, wxEvent& event ) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
mutable wxString m_tempString;
|
||||
|
||||
@@ -254,24 +254,24 @@ public:
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
virtual void UpdateControl( wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
wxWindow* primaryCtrl,
|
||||
wxEvent& event ) const;
|
||||
wxEvent& event ) const wxOVERRIDE;
|
||||
virtual bool GetValueFromControl( wxVariant& variant,
|
||||
wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
|
||||
virtual wxString GetName() const;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
|
||||
//virtual wxPGCellRenderer* GetCellRenderer() const;
|
||||
virtual void SetControlStringValue( wxPGProperty* property,
|
||||
wxWindow* ctrl,
|
||||
const wxString& txt ) const;
|
||||
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
|
||||
const wxString& txt ) const wxOVERRIDE;
|
||||
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
|
||||
|
||||
// Provided so that, for example, ComboBox editor can use the same code
|
||||
// (multiple inheritance would get way too messy).
|
||||
@@ -297,32 +297,32 @@ public:
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
virtual void UpdateControl( wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
wxWindow* primaryCtrl,
|
||||
wxEvent& event ) const;
|
||||
wxEvent& event ) const wxOVERRIDE;
|
||||
virtual bool GetValueFromControl( wxVariant& variant,
|
||||
wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual void SetValueToUnspecified( wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
virtual wxString GetName() const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
|
||||
virtual void SetControlIntValue( wxPGProperty* property,
|
||||
wxWindow* ctrl,
|
||||
int value ) const;
|
||||
int value ) const wxOVERRIDE;
|
||||
virtual void SetControlStringValue( wxPGProperty* property,
|
||||
wxWindow* ctrl,
|
||||
const wxString& txt ) const;
|
||||
const wxString& txt ) const wxOVERRIDE;
|
||||
|
||||
virtual int InsertItem( wxWindow* ctrl,
|
||||
const wxString& label,
|
||||
int index ) const;
|
||||
virtual void DeleteItem( wxWindow* ctrl, int index ) const;
|
||||
virtual bool CanContainCustomImage() const;
|
||||
int index ) const wxOVERRIDE;
|
||||
virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE;
|
||||
virtual bool CanContainCustomImage() const wxOVERRIDE;
|
||||
|
||||
// CreateControls calls this with CB_READONLY in extraStyle
|
||||
wxWindow* CreateControlsBase( wxPropertyGrid* propgrid,
|
||||
@@ -344,20 +344,20 @@ public:
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
|
||||
virtual wxString GetName() const;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
|
||||
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const;
|
||||
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const wxOVERRIDE;
|
||||
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
|
||||
wxWindow* ctrl, wxEvent& event ) const;
|
||||
wxWindow* ctrl, wxEvent& event ) const wxOVERRIDE;
|
||||
|
||||
virtual bool GetValueFromControl( wxVariant& variant,
|
||||
wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
|
||||
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
|
||||
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
|
||||
|
||||
};
|
||||
|
||||
@@ -367,12 +367,12 @@ class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
|
||||
public:
|
||||
wxPGChoiceAndButtonEditor() {}
|
||||
virtual ~wxPGChoiceAndButtonEditor();
|
||||
virtual wxString GetName() const;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor);
|
||||
};
|
||||
@@ -383,12 +383,12 @@ wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor
|
||||
public:
|
||||
wxPGTextCtrlAndButtonEditor() {}
|
||||
virtual ~wxPGTextCtrlAndButtonEditor();
|
||||
virtual wxString GetName() const;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor);
|
||||
};
|
||||
@@ -407,32 +407,32 @@ public:
|
||||
wxPGCheckBoxEditor() {}
|
||||
virtual ~wxPGCheckBoxEditor();
|
||||
|
||||
virtual wxString GetName() const;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
const wxSize& size) const wxOVERRIDE;
|
||||
virtual void UpdateControl( wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
wxWindow* primaryCtrl,
|
||||
wxEvent& event ) const;
|
||||
wxEvent& event ) const wxOVERRIDE;
|
||||
virtual bool GetValueFromControl( wxVariant& variant,
|
||||
wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
virtual void SetValueToUnspecified( wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
wxWindow* ctrl ) const wxOVERRIDE;
|
||||
|
||||
virtual void DrawValue( wxDC& dc,
|
||||
const wxRect& rect,
|
||||
wxPGProperty* property,
|
||||
const wxString& text ) const;
|
||||
const wxString& text ) const wxOVERRIDE;
|
||||
//virtual wxPGCellRenderer* GetCellRenderer() const;
|
||||
|
||||
virtual void SetControlIntValue( wxPGProperty* property,
|
||||
wxWindow* ctrl,
|
||||
int value ) const;
|
||||
int value ) const wxOVERRIDE;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -184,11 +184,11 @@ public:
|
||||
wxPGProperty* property,
|
||||
int column,
|
||||
int item,
|
||||
int flags ) const;
|
||||
int flags ) const wxOVERRIDE;
|
||||
|
||||
virtual wxSize GetImageSize( const wxPGProperty* property,
|
||||
int column,
|
||||
int item ) const;
|
||||
int item ) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
};
|
||||
@@ -2572,7 +2572,7 @@ private:
|
||||
//
|
||||
|
||||
#define WX_PG_DECLARE_DOGETEDITORCLASS \
|
||||
virtual const wxPGEditor* DoGetEditorClass() const;
|
||||
virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE;
|
||||
|
||||
#ifndef WX_PG_DECLARE_PROPERTY_CLASS
|
||||
#define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
|
||||
@@ -2612,7 +2612,7 @@ public:
|
||||
wxPGRootProperty( const wxString& name = wxS("<Root>") );
|
||||
virtual ~wxPGRootProperty();
|
||||
|
||||
virtual bool StringToValue( wxVariant&, const wxString&, int ) const
|
||||
virtual bool StringToValue( wxVariant&, const wxString&, int ) const wxOVERRIDE
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -2642,8 +2642,8 @@ public:
|
||||
|
||||
int GetTextExtent( const wxWindow* wnd, const wxFont& font ) const;
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags ) const;
|
||||
virtual wxString GetValueAsString( int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags ) const wxOVERRIDE;
|
||||
virtual wxString GetValueAsString( int argFlags = 0 ) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void SetTextColIndex( unsigned int colInd )
|
||||
|
||||
@@ -521,11 +521,11 @@ public:\
|
||||
\
|
||||
const classname &GetValue() const { return m_value; } \
|
||||
\
|
||||
virtual bool Eq(wxVariantData& data) const; \
|
||||
virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \
|
||||
\
|
||||
virtual wxString GetType() const; \
|
||||
virtual wxString GetType() const wxOVERRIDE; \
|
||||
\
|
||||
virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
|
||||
virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \
|
||||
\
|
||||
DECLARE_WXANY_CONVERSION() \
|
||||
protected:\
|
||||
|
||||
@@ -115,16 +115,16 @@ public:
|
||||
const wxString& value = wxEmptyString );
|
||||
virtual ~wxStringProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
|
||||
/** This is updated so "<composed>" special value can be handled.
|
||||
*/
|
||||
virtual void OnSetValue();
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
};
|
||||
@@ -167,7 +167,7 @@ public:
|
||||
|
||||
wxNumericPropertyValidator( NumericType numericType, int base = 10 );
|
||||
virtual ~wxNumericPropertyValidator() { }
|
||||
virtual bool Validate(wxWindow* parent);
|
||||
virtual bool Validate(wxWindow* parent) wxOVERRIDE;
|
||||
};
|
||||
|
||||
#endif // wxUSE_VALIDATORS
|
||||
@@ -228,17 +228,17 @@ public:
|
||||
const wxString& name,
|
||||
const wxLongLong& value );
|
||||
#endif
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool ValidateValue( wxVariant& value,
|
||||
wxPGValidationInfo& validationInfo ) const;
|
||||
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
|
||||
virtual bool IntToValue( wxVariant& variant,
|
||||
int number,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
static wxValidator* GetClassValidator();
|
||||
virtual wxValidator* DoGetValidator() const;
|
||||
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
|
||||
|
||||
/** Validation helpers.
|
||||
*/
|
||||
@@ -291,17 +291,17 @@ public:
|
||||
const wxString& name,
|
||||
const wxULongLong& value );
|
||||
#endif
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
virtual bool ValidateValue( wxVariant& value,
|
||||
wxPGValidationInfo& validationInfo ) const;
|
||||
virtual wxValidator* DoGetValidator () const;
|
||||
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
|
||||
virtual wxValidator* DoGetValidator () const wxOVERRIDE;
|
||||
virtual bool IntToValue( wxVariant& variant,
|
||||
int number,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxByte m_base;
|
||||
@@ -342,15 +342,15 @@ public:
|
||||
double value = 0.0 );
|
||||
virtual ~wxFloatProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual wxVariant DoGetAttribute( const wxString& name ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
|
||||
|
||||
virtual bool ValidateValue( wxVariant& value,
|
||||
wxPGValidationInfo& validationInfo ) const;
|
||||
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
|
||||
|
||||
/** Validation helper.
|
||||
*/
|
||||
@@ -360,7 +360,7 @@ public:
|
||||
int mode =
|
||||
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
|
||||
static wxValidator* GetClassValidator();
|
||||
virtual wxValidator* DoGetValidator () const;
|
||||
virtual wxValidator* DoGetValidator () const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
int m_precision;
|
||||
@@ -385,14 +385,14 @@ public:
|
||||
bool value = false );
|
||||
virtual ~wxBoolProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool IntToValue( wxVariant& variant,
|
||||
int number, int argFlags = 0 ) const;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual wxVariant DoGetAttribute( const wxString& name ) const;
|
||||
int number, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -453,19 +453,19 @@ public:
|
||||
|
||||
size_t GetItemCount() const { return m_choices.GetCount(); }
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool ValidateValue( wxVariant& value,
|
||||
wxPGValidationInfo& validationInfo ) const;
|
||||
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
|
||||
|
||||
// If wxPG_FULL_VALUE is not set in flags, then the value is interpreted
|
||||
// as index to choices list. Otherwise, it is actual value.
|
||||
virtual bool IntToValue( wxVariant& variant,
|
||||
int number,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
|
||||
//
|
||||
// Additional virtuals
|
||||
@@ -476,9 +476,9 @@ public:
|
||||
// GetChoiceSelection needs to overridden since m_index is
|
||||
// the true index, and various property classes derived from
|
||||
// this take advantage of it.
|
||||
virtual int GetChoiceSelection() const { return m_index; }
|
||||
virtual int GetChoiceSelection() const wxOVERRIDE { return m_index; }
|
||||
|
||||
virtual void OnValidationFailure( wxVariant& pendingValue );
|
||||
virtual void OnValidationFailure( wxVariant& pendingValue ) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -600,20 +600,20 @@ public:
|
||||
int value = 0 );
|
||||
virtual ~wxFlagsProperty ();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int flags ) const;
|
||||
int flags ) const wxOVERRIDE;
|
||||
virtual wxVariant ChildChanged( wxVariant& thisValue,
|
||||
int childIndex,
|
||||
wxVariant& childValue ) const;
|
||||
virtual void RefreshChildren();
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
wxVariant& childValue ) const wxOVERRIDE;
|
||||
virtual void RefreshChildren() wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
|
||||
// GetChoiceSelection needs to overridden since m_choices is
|
||||
// used and value is integer, but it is not index.
|
||||
virtual int GetChoiceSelection() const { return wxNOT_FOUND; }
|
||||
virtual int GetChoiceSelection() const wxOVERRIDE { return wxNOT_FOUND; }
|
||||
|
||||
// helpers
|
||||
size_t GetItemCount() const { return m_choices.GetCount(); }
|
||||
@@ -644,7 +644,7 @@ class WXDLLIMPEXP_PROPGRID
|
||||
{
|
||||
public:
|
||||
virtual bool DoShowDialog( wxPropertyGrid* propGrid,
|
||||
wxPGProperty* property );
|
||||
wxPGProperty* property ) wxOVERRIDE;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -677,16 +677,16 @@ public:
|
||||
const wxString& value = wxEmptyString );
|
||||
virtual ~wxFileProperty ();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
|
||||
static wxValidator* GetClassValidator();
|
||||
virtual wxValidator* DoGetValidator() const;
|
||||
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
|
||||
|
||||
/**
|
||||
Returns filename to file represented by current value.
|
||||
@@ -717,7 +717,7 @@ class WXDLLIMPEXP_PROPGRID
|
||||
{
|
||||
public:
|
||||
virtual bool DoShowDialog( wxPropertyGrid* propGrid,
|
||||
wxPGProperty* property );
|
||||
wxPGProperty* property ) wxOVERRIDE;
|
||||
};
|
||||
|
||||
|
||||
@@ -736,12 +736,12 @@ public:
|
||||
const wxString& value = wxEmptyString );
|
||||
virtual ~wxLongStringProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
|
||||
|
||||
// Shows string editor dialog. Value to be edited should be read from
|
||||
// value, and if dialog is not cancelled, it should be stored back and true
|
||||
@@ -774,10 +774,10 @@ public:
|
||||
const wxString& value = wxEmptyString );
|
||||
virtual ~wxDirProperty();
|
||||
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual wxValidator* DoGetValidator() const;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
|
||||
|
||||
virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value );
|
||||
virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value ) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxString m_dlgMessage;
|
||||
@@ -806,14 +806,14 @@ public:
|
||||
const wxArrayString& value = wxArrayString() );
|
||||
virtual ~wxArrayStringProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual void OnSetValue() wxOVERRIDE;
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
int argFlags = 0 ) const wxOVERRIDE;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
|
||||
|
||||
// Implement in derived class for custom array-to-string conversion.
|
||||
virtual void ConvertArrayToString(const wxArrayString& arr,
|
||||
@@ -1041,12 +1041,12 @@ public:
|
||||
|
||||
void Init();
|
||||
|
||||
virtual void SetDialogValue( const wxVariant& value )
|
||||
virtual void SetDialogValue( const wxVariant& value ) wxOVERRIDE
|
||||
{
|
||||
m_array = value.GetArrayString();
|
||||
}
|
||||
|
||||
virtual wxVariant GetDialogValue() const
|
||||
virtual wxVariant GetDialogValue() const wxOVERRIDE
|
||||
{
|
||||
return m_array;
|
||||
}
|
||||
@@ -1061,19 +1061,19 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual bool OnCustomNewAction(wxString* resString);
|
||||
virtual bool OnCustomNewAction(wxString* resString) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxArrayString m_array;
|
||||
|
||||
wxArrayStringProperty* m_pCallingClass;
|
||||
|
||||
virtual wxString ArrayGet( size_t index );
|
||||
virtual size_t ArrayGetCount();
|
||||
virtual bool ArrayInsert( const wxString& str, int index );
|
||||
virtual bool ArraySet( size_t index, const wxString& str );
|
||||
virtual void ArrayRemoveAt( int index );
|
||||
virtual void ArraySwap( size_t first, size_t second );
|
||||
virtual wxString ArrayGet( size_t index ) wxOVERRIDE;
|
||||
virtual size_t ArrayGetCount() wxOVERRIDE;
|
||||
virtual bool ArrayInsert( const wxString& str, int index ) wxOVERRIDE;
|
||||
virtual bool ArraySet( size_t index, const wxString& str ) wxOVERRIDE;
|
||||
virtual void ArrayRemoveAt( int index ) wxOVERRIDE;
|
||||
virtual void ArraySwap( size_t first, size_t second ) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog);
|
||||
|
||||
Reference in New Issue
Block a user