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

wxColour lost its Create method, use direct creation for XTI

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-07-04 12:31:47 +00:00
parent 99ae6124dd
commit 8e952859a6
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/xti.h
View File

@@ -1399,6 +1399,28 @@ struct wxConstructorBridge_3 : public wxConstructorBridge
const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) } ; \ const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) } ; \
const int klass::ms_constructorPropertiesCount = 3 ; const int klass::ms_constructorPropertiesCount = 3 ;
// direct constructor version
template<typename Class,
typename T0, typename T1, typename T2>
struct wxDirectConstructorBridge_3 : public wxDirectConstructorBrigde
{
void Create(wxObject * &o, wxxVariant *args)
{
o = new Class(
args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
);
}
};
#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
wxDirectConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) , wxT(#v1) , wxT(#v2) } ; \
const int klass::ms_constructorPropertiesCount = 3;
// 4 params // 4 params
template<typename Class, template<typename Class,

2
src/msw/colour.cpp
View File

@@ -54,7 +54,7 @@ wxBEGIN_PROPERTIES_TABLE(wxColour)
wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group")) wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
wxEND_PROPERTIES_TABLE() wxEND_PROPERTIES_TABLE()
wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue ) wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
wxBEGIN_HANDLERS_TABLE(wxColour) wxBEGIN_HANDLERS_TABLE(wxColour)
wxEND_HANDLERS_TABLE() wxEND_HANDLERS_TABLE()