macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -216,63 +216,63 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
|
|||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
WX_DEFINE_FLAGS( wxListCtrlStyle )
|
WX_DEFINE_FLAGS( wxListCtrlStyle )
|
||||||
|
|
||||||
WX_BEGIN_FLAGS( wxListCtrlStyle )
|
wxBEGIN_FLAGS( wxListCtrlStyle )
|
||||||
// new style border flags, we put them first to
|
// new style border flags, we put them first to
|
||||||
// use them for streaming out
|
// use them for streaming out
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
|
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
|
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
|
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_RAISED)
|
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_STATIC)
|
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_NONE)
|
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||||
|
|
||||||
// old style border flags
|
// old style border flags
|
||||||
WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
|
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
|
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
|
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxRAISED_BORDER)
|
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSTATIC_BORDER)
|
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxNO_BORDER)
|
wxFLAGS_MEMBER(wxNO_BORDER)
|
||||||
|
|
||||||
// standard window styles
|
// standard window styles
|
||||||
WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
|
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
||||||
WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
|
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
||||||
WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
||||||
WX_FLAGS_MEMBER(wxWANTS_CHARS)
|
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
||||||
WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
||||||
WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
||||||
WX_FLAGS_MEMBER(wxVSCROLL)
|
wxFLAGS_MEMBER(wxVSCROLL)
|
||||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
wxFLAGS_MEMBER(wxHSCROLL)
|
||||||
|
|
||||||
WX_FLAGS_MEMBER(wxLC_LIST)
|
wxFLAGS_MEMBER(wxLC_LIST)
|
||||||
WX_FLAGS_MEMBER(wxLC_REPORT)
|
wxFLAGS_MEMBER(wxLC_REPORT)
|
||||||
WX_FLAGS_MEMBER(wxLC_ICON)
|
wxFLAGS_MEMBER(wxLC_ICON)
|
||||||
WX_FLAGS_MEMBER(wxLC_SMALL_ICON)
|
wxFLAGS_MEMBER(wxLC_SMALL_ICON)
|
||||||
WX_FLAGS_MEMBER(wxLC_ALIGN_TOP)
|
wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
|
||||||
WX_FLAGS_MEMBER(wxLC_ALIGN_LEFT)
|
wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
|
||||||
WX_FLAGS_MEMBER(wxLC_AUTOARRANGE)
|
wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
|
||||||
WX_FLAGS_MEMBER(wxLC_USER_TEXT)
|
wxFLAGS_MEMBER(wxLC_USER_TEXT)
|
||||||
WX_FLAGS_MEMBER(wxLC_EDIT_LABELS)
|
wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
|
||||||
WX_FLAGS_MEMBER(wxLC_NO_HEADER)
|
wxFLAGS_MEMBER(wxLC_NO_HEADER)
|
||||||
WX_FLAGS_MEMBER(wxLC_SINGLE_SEL)
|
wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
|
||||||
WX_FLAGS_MEMBER(wxLC_SORT_ASCENDING)
|
wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
|
||||||
WX_FLAGS_MEMBER(wxLC_SORT_DESCENDING)
|
wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
|
||||||
WX_FLAGS_MEMBER(wxLC_VIRTUAL)
|
wxFLAGS_MEMBER(wxLC_VIRTUAL)
|
||||||
|
|
||||||
WX_END_FLAGS( wxListCtrlStyle )
|
wxEND_FLAGS( wxListCtrlStyle )
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
|
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
|
||||||
|
|
||||||
WX_BEGIN_PROPERTIES_TABLE(wxListCtrl)
|
wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
|
||||||
WX_EVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||||
|
|
||||||
WX_PROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
||||||
WX_END_PROPERTIES_TABLE()
|
wxEND_PROPERTIES_TABLE()
|
||||||
|
|
||||||
WX_BEGIN_HANDLERS_TABLE(wxListCtrl)
|
wxBEGIN_HANDLERS_TABLE(wxListCtrl)
|
||||||
WX_END_HANDLERS_TABLE()
|
wxEND_HANDLERS_TABLE()
|
||||||
|
|
||||||
WX_CONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TODO : Expose more information of a list's layout etc. via appropriate objects (<28> la NotebookPageInfo)
|
TODO : Expose more information of a list's layout etc. via appropriate objects (<28> la NotebookPageInfo)
|
||||||
|
@@ -119,68 +119,68 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
|
|||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
WX_DEFINE_FLAGS( wxTextCtrlStyle )
|
WX_DEFINE_FLAGS( wxTextCtrlStyle )
|
||||||
|
|
||||||
WX_BEGIN_FLAGS( wxTextCtrlStyle )
|
wxBEGIN_FLAGS( wxTextCtrlStyle )
|
||||||
// new style border flags, we put them first to
|
// new style border flags, we put them first to
|
||||||
// use them for streaming out
|
// use them for streaming out
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
|
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
|
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
|
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_RAISED)
|
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_STATIC)
|
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_NONE)
|
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||||
|
|
||||||
// old style border flags
|
// old style border flags
|
||||||
WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
|
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
|
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
|
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxRAISED_BORDER)
|
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSTATIC_BORDER)
|
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxNO_BORDER)
|
wxFLAGS_MEMBER(wxNO_BORDER)
|
||||||
|
|
||||||
// standard window styles
|
// standard window styles
|
||||||
WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
|
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
||||||
WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
|
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
||||||
WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
||||||
WX_FLAGS_MEMBER(wxWANTS_CHARS)
|
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
||||||
WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
||||||
WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
||||||
WX_FLAGS_MEMBER(wxVSCROLL)
|
wxFLAGS_MEMBER(wxVSCROLL)
|
||||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
wxFLAGS_MEMBER(wxHSCROLL)
|
||||||
|
|
||||||
WX_FLAGS_MEMBER(wxTE_PROCESS_ENTER)
|
wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
|
||||||
WX_FLAGS_MEMBER(wxTE_PROCESS_TAB)
|
wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
|
||||||
WX_FLAGS_MEMBER(wxTE_MULTILINE)
|
wxFLAGS_MEMBER(wxTE_MULTILINE)
|
||||||
WX_FLAGS_MEMBER(wxTE_PASSWORD)
|
wxFLAGS_MEMBER(wxTE_PASSWORD)
|
||||||
WX_FLAGS_MEMBER(wxTE_READONLY)
|
wxFLAGS_MEMBER(wxTE_READONLY)
|
||||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
wxFLAGS_MEMBER(wxHSCROLL)
|
||||||
WX_FLAGS_MEMBER(wxTE_RICH)
|
wxFLAGS_MEMBER(wxTE_RICH)
|
||||||
WX_FLAGS_MEMBER(wxTE_RICH2)
|
wxFLAGS_MEMBER(wxTE_RICH2)
|
||||||
WX_FLAGS_MEMBER(wxTE_AUTO_URL)
|
wxFLAGS_MEMBER(wxTE_AUTO_URL)
|
||||||
WX_FLAGS_MEMBER(wxTE_NOHIDESEL)
|
wxFLAGS_MEMBER(wxTE_NOHIDESEL)
|
||||||
WX_FLAGS_MEMBER(wxTE_LEFT)
|
wxFLAGS_MEMBER(wxTE_LEFT)
|
||||||
WX_FLAGS_MEMBER(wxTE_CENTRE)
|
wxFLAGS_MEMBER(wxTE_CENTRE)
|
||||||
WX_FLAGS_MEMBER(wxTE_RIGHT)
|
wxFLAGS_MEMBER(wxTE_RIGHT)
|
||||||
WX_FLAGS_MEMBER(wxTE_DONTWRAP)
|
wxFLAGS_MEMBER(wxTE_DONTWRAP)
|
||||||
WX_FLAGS_MEMBER(wxTE_LINEWRAP)
|
wxFLAGS_MEMBER(wxTE_LINEWRAP)
|
||||||
WX_FLAGS_MEMBER(wxTE_WORDWRAP)
|
wxFLAGS_MEMBER(wxTE_WORDWRAP)
|
||||||
|
|
||||||
WX_END_FLAGS( wxTextCtrlStyle )
|
wxEND_FLAGS( wxTextCtrlStyle )
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
|
IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
|
||||||
|
|
||||||
WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl)
|
wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
|
||||||
WX_EVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||||
WX_EVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
||||||
|
|
||||||
WX_PROPERTY( Font , wxFont , SetFont , GetFont ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
wxPROPERTY( Font , wxFont , SetFont , GetFont ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
||||||
WX_PROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||||
WX_PROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
||||||
WX_END_PROPERTIES_TABLE()
|
wxEND_PROPERTIES_TABLE()
|
||||||
|
|
||||||
WX_BEGIN_HANDLERS_TABLE(wxTextCtrl)
|
wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
|
||||||
WX_END_HANDLERS_TABLE()
|
wxEND_HANDLERS_TABLE()
|
||||||
|
|
||||||
WX_CONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
|
wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
|
||||||
#else
|
#else
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
|
||||||
#endif
|
#endif
|
||||||
|
@@ -248,7 +248,7 @@ IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase,"wx/window.h", wxWin
|
|||||||
|
|
||||||
// make wxWindowList known before the property is used
|
// make wxWindowList known before the property is used
|
||||||
|
|
||||||
WX_COLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
|
wxCOLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
|
||||||
|
|
||||||
template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
|
template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
|
||||||
{
|
{
|
||||||
@@ -257,81 +257,82 @@ template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVari
|
|||||||
|
|
||||||
WX_DEFINE_FLAGS( wxWindowStyle )
|
WX_DEFINE_FLAGS( wxWindowStyle )
|
||||||
|
|
||||||
WX_BEGIN_FLAGS( wxWindowStyle )
|
wxBEGIN_FLAGS( wxWindowStyle )
|
||||||
// new style border flags, we put them first to
|
// new style border flags, we put them first to
|
||||||
// use them for streaming out
|
// use them for streaming out
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
|
|
||||||
WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
|
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
|
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_RAISED)
|
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_STATIC)
|
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||||
WX_FLAGS_MEMBER(wxBORDER_NONE)
|
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||||
|
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||||
|
|
||||||
// old style border flags
|
// old style border flags
|
||||||
WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
|
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
|
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
|
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxRAISED_BORDER)
|
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxSTATIC_BORDER)
|
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
||||||
WX_FLAGS_MEMBER(wxNO_BORDER)
|
wxFLAGS_MEMBER(wxNO_BORDER)
|
||||||
|
|
||||||
// standard window styles
|
// standard window styles
|
||||||
WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
|
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
||||||
WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
|
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
||||||
WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
||||||
WX_FLAGS_MEMBER(wxWANTS_CHARS)
|
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
||||||
WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
||||||
WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
||||||
WX_FLAGS_MEMBER(wxVSCROLL)
|
wxFLAGS_MEMBER(wxVSCROLL)
|
||||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
wxFLAGS_MEMBER(wxHSCROLL)
|
||||||
|
|
||||||
WX_END_FLAGS( wxWindowStyle )
|
wxEND_FLAGS( wxWindowStyle )
|
||||||
|
|
||||||
WX_BEGIN_PROPERTIES_TABLE(wxWindow)
|
wxBEGIN_PROPERTIES_TABLE(wxWindow)
|
||||||
WX_EVENT_PROPERTY( Close , wxEVT_CLOSE_WINDOW , wxCloseEvent)
|
wxEVENT_PROPERTY( Close , wxEVT_CLOSE_WINDOW , wxCloseEvent)
|
||||||
WX_EVENT_PROPERTY( Create , wxEVT_CREATE , wxWindowCreateEvent )
|
wxEVENT_PROPERTY( Create , wxEVT_CREATE , wxWindowCreateEvent )
|
||||||
WX_EVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
|
wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
|
||||||
// Always constructor Properties first
|
// Always constructor Properties first
|
||||||
|
|
||||||
WX_READONLY_PROPERTY( Parent,wxWindow*, GetParent, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||||
WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
wxPROPERTY( Id,wxWindowID, SetId, GetId, -1, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
||||||
WX_PROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
|
wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
|
||||||
WX_PROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
|
wxPROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
|
||||||
WX_PROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
wxPROPERTY( 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 , wxPROP_OBJECT_GRAPH /*flags*/ , wxT("Helpstring") , wxT("group"))
|
wxREADONLY_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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
|
wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
|
||||||
WX_PROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
|
wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
|
||||||
WX_PROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
|
wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
|
||||||
WX_PROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||||
WX_PROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
wxPROPERTY( 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("") )
|
wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )
|
||||||
WX_PROPERTY( Font , wxFont , SetFont , GetWindowFont , )
|
wxPROPERTY( Font , wxFont , SetFont , GetWindowFont , )
|
||||||
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
|
wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
|
||||||
// MaxHeight, Width , MinHeight , Width
|
// MaxHeight, Width , MinHeight , Width
|
||||||
// TODO switch label to control and title to toplevels
|
// TODO switch label to control and title to toplevels
|
||||||
|
|
||||||
WX_PROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
|
wxPROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
|
||||||
//WX_PROPERTY( Cursor , wxCursor , SetCursor , GetCursor , )
|
//wxPROPERTY( Cursor , wxCursor , SetCursor , GetCursor , )
|
||||||
// WX_PROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
|
// wxPROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
|
||||||
WX_PROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
|
wxPROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
WX_END_PROPERTIES_TABLE()
|
wxEND_PROPERTIES_TABLE()
|
||||||
|
|
||||||
WX_BEGIN_HANDLERS_TABLE(wxWindow)
|
wxBEGIN_HANDLERS_TABLE(wxWindow)
|
||||||
WX_END_HANDLERS_TABLE()
|
wxEND_HANDLERS_TABLE()
|
||||||
|
|
||||||
WX_CONSTRUCTOR_DUMMY(wxWindow)
|
wxCONSTRUCTOR_DUMMY(wxWindow)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
|
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
|
||||||
|
Reference in New Issue
Block a user