Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxPG_IMPLEMENT_PROPERTY_CLASS macro in the propgrid sample.

Browse Source 
Replace old WX_PG_IMPLEMENT_PROPERTY_CLASS macro with new and simplified wxPG_IMPLEMENT_PROPERTY_CLASS macro.

See #15541

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2015-02-04 16:53:46 +00:00
parent 35b53a8c30
commit c1b777cd16
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/propgrid/propgrid.cpp
View File

@@ -207,8 +207,7 @@ private:
WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxVector3f) WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxVector3f)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty,TextCtrl)
wxVector3f,const wxVector3f&,TextCtrl)
wxVectorProperty::wxVectorProperty( const wxString& label, wxVectorProperty::wxVectorProperty( const wxString& label,
@@ -259,8 +258,7 @@ wxVariant wxVectorProperty::ChildChanged( wxVariant& thisValue,
WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxTriangle) WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxTriangle)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty,TextCtrl)
wxTriangle,const wxTriangle&,TextCtrl)
wxTriangleProperty::wxTriangleProperty( const wxString& label, wxTriangleProperty::wxTriangleProperty( const wxString& label,

17
samples/propgrid/sampleprops.cpp
View File

@@ -50,8 +50,7 @@ bool operator == (const wxFontData&, const wxFontData&)
IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(wxFontData) IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(wxFontData)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,TextCtrlAndButton)
wxFontData,const wxFontData&,TextCtrlAndButton)
wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& name, wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& name,
const wxFontData& value ) : wxFontProperty(label,name,value.GetInitialFont()) const wxFontData& value ) : wxFontProperty(label,name,value.GetInitialFont())
@@ -196,8 +195,7 @@ wxVariant wxFontDataProperty::ChildChanged( wxVariant& thisValue,
// wxSizeProperty // wxSizeProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxSizeProperty,wxPGProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxSizeProperty,wxPGProperty,TextCtrl)
wxSize,const wxSize&,TextCtrl)
wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name, wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name,
const wxSize& value) : wxPGProperty(label,name) const wxSize& value) : wxPGProperty(label,name)
@@ -237,8 +235,7 @@ wxVariant wxSizeProperty::ChildChanged( wxVariant& thisValue,
// wxPointProperty // wxPointProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxPointProperty,wxPGProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxPointProperty,wxPGProperty,TextCtrl)
wxPoint,const wxPoint&,TextCtrl)
wxPointProperty::wxPointProperty( const wxString& label, const wxString& name, wxPointProperty::wxPointProperty( const wxString& label, const wxString& name,
const wxPoint& value) : wxPGProperty(label,name) const wxPoint& value) : wxPGProperty(label,name)
@@ -489,11 +486,9 @@ bool operator == (const wxArrayDouble& a, const wxArrayDouble& b)
WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxArrayDouble) WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxArrayDouble)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxArrayDoubleProperty, wxPG_IMPLEMENT_PROPERTY_CLASS(wxArrayDoubleProperty,
wxPGProperty, wxPGProperty,
wxArrayDouble, TextCtrlAndButton)
const wxArrayDouble&,
TextCtrlAndButton)
wxArrayDoubleProperty::wxArrayDoubleProperty (const wxString& label, wxArrayDoubleProperty::wxArrayDoubleProperty (const wxString& label,