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

xti property extensions, style bits additions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-23 00:41:33 +00:00
parent cb73e6001f
commit 067e9be685
19 changed files with 159 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/msw/button.cpp
View File

@@ -47,13 +47,67 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
enum wxButtonStyleBits
{
wxButtonExactFitBit = 0 ,
wxButtonLeftBit = 6 ,
wxButtonTopBit = 7 ,
wxButtonRightBit = 8 ,
wxButtonBottomBit = 9 ,
// wxNoFullRepaintOnResizeBit = 16 ,
// wxPopUpWindowBit = 17 ,
wxWantCharsBit = 18 ,
// wxTabTraversalBit = 19 ,
wxTransparentWindowBit = 20 ,
wxBorderNoneBit = 21 ,
// wxClipChildrenBit = 22 ,
// wxAlwaysShowScrollBarsBit = 23 ,
wxBorderStaticBit = 24 ,
wxBorderSimpleBit = 25 ,
wxBorderRaisedBit = 26 ,
wxBorderSunkenBit = 27 ,
wxBorderDoubleBit = 28 ,
// wxCaptionBit = 29 ,
// wxClipSiblingsBit = 29 , // caption not used for non toplevel
// wxHScrolBit = 30 ,
// wxVScrollBit = 31 ,
} ;
typedef wxFlags<wxButtonStyleBits> wxButtonStyleFlags ;
WX_BEGIN_ENUM( wxButtonStyleBits)
WX_ENUM_MEMBER( wxButtonExactFitBit)
WX_ENUM_MEMBER( wxButtonLeftBit)
WX_ENUM_MEMBER( wxButtonTopBit)
WX_ENUM_MEMBER( wxButtonRightBit)
WX_ENUM_MEMBER( wxButtonBottomBit)
WX_ENUM_MEMBER( wxWantCharsBit)
WX_ENUM_MEMBER( wxTransparentWindowBit)
WX_ENUM_MEMBER( wxBorderNoneBit)
WX_ENUM_MEMBER( wxBorderStaticBit)
WX_ENUM_MEMBER( wxBorderSimpleBit)
WX_ENUM_MEMBER( wxBorderRaisedBit)
WX_ENUM_MEMBER( wxBorderSunkenBit)
WX_ENUM_MEMBER( wxBorderDoubleBit)
WX_END_ENUM( wxButtonStyleBits)
WX_IMPLEMENT_SET_STREAMING( wxButtonStyleFlags , wxButtonStyleBits)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
WX_BEGIN_PROPERTIES_TABLE(wxButton) WX_BEGIN_PROPERTIES_TABLE(wxButton)
WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent ) WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Label, wxString , SetLabel, GetLabel, wxEmptyString, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY_FLAGS( WindowStyle , wxButtonStyleFlags , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
WX_PROPERTY( Font , wxFont , SetFont , GetFont , )
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxButton) WX_BEGIN_HANDLERS_TABLE(wxButton)

6
src/msw/checkbox.cpp
View File

@@ -53,9 +53,9 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
WX_BEGIN_PROPERTIES_TABLE(wxCheckBox) WX_BEGIN_PROPERTIES_TABLE(wxCheckBox)
WX_DELEGATE( OnClick , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent ) WX_DELEGATE( OnClick , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString ) WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Value ,bool, SetValue, GetValue, ) WX_PROPERTY( Value ,bool, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxCheckBox) WX_BEGIN_HANDLERS_TABLE(wxCheckBox)

6
src/msw/choice.cpp
View File

@@ -45,9 +45,9 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/checkbox.h")
WX_BEGIN_PROPERTIES_TABLE(wxChoice) WX_BEGIN_PROPERTIES_TABLE(wxChoice)
// TODO DELEGATES // TODO DELEGATES
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings ) WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Selection ,int, SetSelection, GetSelection, ) WX_PROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxChoice) WX_BEGIN_HANDLERS_TABLE(wxChoice)

38
src/msw/colour.cpp
View File

@@ -26,12 +26,44 @@
#include <string.h> #include <string.h>
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
/*
template<> void wxStringReadValue(const wxString &s , wxColour &data )
{
// copied from VS xrc
unsigned long tmp = 0;
if (s.Length() != 7 || s[0u] != wxT('#') ||
wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
{
wxLogError(_("String To Colour : Incorrect colour specification : %s"),
s.c_str() );
data = wxNullColour;
}
else
{
data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
(unsigned char) ((tmp & 0x00FF00) >> 8),
(unsigned char) ((tmp & 0x0000FF)));
}
}
template<> void wxStringWriteValue(wxString &s , const wxColour &data )
{
s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
}
WX_CUSTOM_TYPE_INFO(wxColour)
*/
IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" )
WX_BEGIN_PROPERTIES_TABLE(wxColour) WX_BEGIN_PROPERTIES_TABLE(wxColour)
WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 ) WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_READONLY_PROPERTY( Green, unsigned char , Green , 0 ) WX_READONLY_PROPERTY( Green, unsigned char , Green , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 ) WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue ) WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )

8
src/msw/combobox.cpp
View File

@@ -58,10 +58,10 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
WX_BEGIN_PROPERTIES_TABLE(wxComboBox) WX_BEGIN_PROPERTIES_TABLE(wxComboBox)
// TODO DELEGATES // TODO DELEGATES
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings ) WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Value ,wxString, SetValue, GetValue, ) WX_PROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Selection ,int, SetSelection, GetSelection, ) WX_PROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxComboBox) WX_BEGIN_HANDLERS_TABLE(wxComboBox)

14
src/msw/font.cpp
View File

@@ -71,13 +71,13 @@ WX_END_ENUM( wxFontWeight )
IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h") IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
WX_BEGIN_PROPERTIES_TABLE(wxFont) WX_BEGIN_PROPERTIES_TABLE(wxFont)
WX_PROPERTY( Size,int, SetPointSize, GetPointSize, 12 ) WX_PROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT ) // wxFontFamily WX_PROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily
WX_PROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL ) // wxFontStyle WX_PROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle
WX_PROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL ) // wxFontWeight WX_PROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight
WX_PROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false ) WX_PROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Face, wxString , SetFaceName, GetFaceName, ) WX_PROPERTY( Face, wxString , SetFaceName, GetFaceName, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT ) WX_PROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_CONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face ) WX_CONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )

2
src/msw/frame.cpp
View File

@@ -83,7 +83,7 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
WX_BEGIN_PROPERTIES_TABLE(wxFrame) WX_BEGIN_PROPERTIES_TABLE(wxFrame)
WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString ) WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
TODO PROPERTIES TODO PROPERTIES

8
src/msw/gauge95.cpp
View File

@@ -70,10 +70,10 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
WX_BEGIN_PROPERTIES_TABLE(wxGauge95) WX_BEGIN_PROPERTIES_TABLE(wxGauge95)
WX_PROPERTY( Value , int , SetValue, GetValue, 0 ) WX_PROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Range , int , SetRange, GetRange, 0 ) WX_PROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 ) WX_PROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 ) WX_PROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
TODO PROPERTIES TODO PROPERTIES
style wxGA_HORIZONTAL style wxGA_HORIZONTAL

6
src/msw/listbox.cpp
View File

@@ -52,9 +52,9 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
WX_BEGIN_PROPERTIES_TABLE(wxListBox) WX_BEGIN_PROPERTIES_TABLE(wxListBox)
// TODO DELEGATES // TODO DELEGATES
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings ) WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY( Selection ,int, SetSelection, GetSelection, ) WX_PROPERTY( Selection ,int, SetSelection, GetSelection,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxListBox) WX_BEGIN_HANDLERS_TABLE(wxListBox)

16
src/msw/notebook.cpp
View File

@@ -121,11 +121,7 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h")
IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" )
template<> const wxTypeInfo* wxGetTypeInfo( wxNotebookPageInfoList * ) WX_COLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ;
{
static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (wxNotebookPageInfo **) NULL) ) ;
return &s_typeInfo ;
}
template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value) template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value)
{ {
@@ -133,7 +129,7 @@ template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theLis
} }
WX_BEGIN_PROPERTIES_TABLE(wxNotebook) WX_BEGIN_PROPERTIES_TABLE(wxNotebook)
WX_PROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos ) WX_PROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
notebookpage notebookpage
object object
@@ -152,10 +148,10 @@ WX_CONSTRUCTOR_4( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint ,
WX_BEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) WX_BEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
WX_READONLY_PROPERTY( Page , wxNotebookPage* , GetPage , ) WX_READONLY_PROPERTY( Page , wxNotebookPage* , GetPage , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_READONLY_PROPERTY( Text , wxString , GetText , wxEmptyString ) WX_READONLY_PROPERTY( Text , wxString , GetText , wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_READONLY_PROPERTY( Selected , bool , GetSelected , false ) WX_READONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_READONLY_PROPERTY( ImageId , int , GetImageId , -1 ) WX_READONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxNotebookPageInfo) WX_BEGIN_HANDLERS_TABLE(wxNotebookPageInfo)

6
src/msw/radiobut.cpp
View File

@@ -53,9 +53,9 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h")
WX_BEGIN_PROPERTIES_TABLE(wxRadioButton) WX_BEGIN_PROPERTIES_TABLE(wxRadioButton)
WX_DELEGATE( OnClick , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent ) WX_DELEGATE( OnClick , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString ) WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY( Value ,bool, SetValue, GetValue, ) WX_PROPERTY( Value ,bool, SetValue, GetValue,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxRadioButton) WX_BEGIN_HANDLERS_TABLE(wxRadioButton)

8
src/msw/scrolbar.cpp
View File

@@ -33,10 +33,10 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
WX_BEGIN_PROPERTIES_TABLE(wxScrollBar) WX_BEGIN_PROPERTIES_TABLE(wxScrollBar)
WX_PROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 ) WX_PROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Range , int , SetRange, GetRange, 0 ) WX_PROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 ) WX_PROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 ) WX_PROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxScrollBar) WX_BEGIN_HANDLERS_TABLE(wxScrollBar)

12
src/msw/slider95.cpp
View File

@@ -41,12 +41,12 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h")
WX_BEGIN_PROPERTIES_TABLE(wxSlider95) WX_BEGIN_PROPERTIES_TABLE(wxSlider95)
WX_PROPERTY( Value , int , SetValue, GetValue , 0) WX_PROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Minimum , int , SetMin, GetMin, 0 ) WX_PROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Maximum , int , SetMax, GetMax, 0 ) WX_PROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 ) WX_PROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 ) WX_PROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 ) WX_PROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxSlider95) WX_BEGIN_HANDLERS_TABLE(wxSlider95)

6
src/msw/spinbutt.cpp
View File

@@ -60,9 +60,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
WX_BEGIN_PROPERTIES_TABLE(wxSpinButton) WX_BEGIN_PROPERTIES_TABLE(wxSpinButton)
WX_PROPERTY( Value , int , SetValue, GetValue, 0 ) WX_PROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Min , int , SetMin, GetMin, 0 ) WX_PROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Max , int , SetMax, GetMax, 0 ) WX_PROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
TODO PROPERTIES TODO PROPERTIES
style wxSP_VERTICAL | wxSP_ARROW_KEYS style wxSP_VERTICAL | wxSP_ARROW_KEYS

8
src/msw/spinctrl.cpp
View File

@@ -54,10 +54,10 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
WX_BEGIN_PROPERTIES_TABLE(wxSpinCtrl) WX_BEGIN_PROPERTIES_TABLE(wxSpinCtrl)
WX_PROPERTY( ValueString , wxString , SetValue , GetValue , ) ; WX_PROPERTY( ValueString , wxString , SetValue , GetValue , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) ;
WX_PROPERTY( Value , int , SetValue, GetValue, 0 ) WX_PROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Min , int , SetMin, GetMin, 0 ) WX_PROPERTY( Min , int , SetMin, GetMin, 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY( Max , int , SetMax, GetMax, 0 ) WX_PROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
TODO PROPERTIES TODO PROPERTIES
style wxSP_ARROW_KEYS style wxSP_ARROW_KEYS

2
src/msw/statbox.cpp
View File

@@ -47,7 +47,7 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
WX_BEGIN_PROPERTIES_TABLE(wxStaticBox) WX_BEGIN_PROPERTIES_TABLE(wxStaticBox)
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString ) WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
/* /*
TODO PROPERTIES : TODO PROPERTIES :
label label

2
src/msw/stattext.cpp
View File

@@ -36,7 +36,7 @@
IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h")
WX_BEGIN_PROPERTIES_TABLE(wxStaticText) WX_BEGIN_PROPERTIES_TABLE(wxStaticText)
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString ) WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxStaticText) WX_BEGIN_HANDLERS_TABLE(wxStaticText)

4
src/msw/textctrl.cpp
View File

@@ -120,8 +120,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl) WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl)
WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) WX_PROPERTY( Font , wxFont , SetFont , GetFont ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY( Value , wxString , SetValue, GetValue, wxEmptyString ) WX_PROPERTY( Value , wxString , SetValue, GetValue, wxEmptyString , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxTextCtrl) WX_BEGIN_HANDLERS_TABLE(wxTextCtrl)

28
src/msw/window.cpp
View File

@@ -235,11 +235,7 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxWindow, wxWindowBase,"wx/window.h")
// make wxWindowList known before the property is used // make wxWindowList known before the property is used
template<> const wxTypeInfo* wxGetTypeInfo( wxWindowList * ) WX_COLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
{
static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (wxWindow **) NULL) ) ;
return &s_typeInfo ;
}
template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value) template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
{ {
@@ -249,23 +245,23 @@ template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVari
WX_BEGIN_PROPERTIES_TABLE(wxWindow) WX_BEGIN_PROPERTIES_TABLE(wxWindow)
// Always constructor Properties first // Always constructor Properties first
WX_READONLY_PROPERTY( Parent,wxWindow*, GetParent, ) WX_READONLY_PROPERTY( Parent,wxWindow*, GetParent, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1 ) WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
WX_PROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) ) // pos WX_PROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
WX_PROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) ) // size WX_PROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
WX_PROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , ) // style WX_PROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
// Then all relations of the object graph // Then all relations of the object graph
WX_READONLY_PROPERTY_COLLECTION( Children , wxWindowList , wxWindowBase* , GetWindowChildren ) WX_READONLY_PROPERTY_COLLECTION( Children , wxWindowList , wxWindowBase* , GetWindowChildren , wxPROP_OBJECT_GRAPH /*flags*/ , wxT("Helpstring") , wxT("group"))
// and finally all other properties // and finally all other properties
WX_PROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , ) // extstyle WX_PROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
WX_PROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , ) // bg WX_PROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
WX_PROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , ) // fg WX_PROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
WX_PROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) ) WX_PROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
WX_PROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) ) WX_PROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
#if 0 #if 0
// possible property candidates (not in xrc) or not valid in all subclasses // possible property candidates (not in xrc) or not valid in all subclasses
WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") ) WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )