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:
@@ -119,68 +119,68 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
|
||||
#if wxUSE_EXTENDED_RTTI
|
||||
WX_DEFINE_FLAGS( wxTextCtrlStyle )
|
||||
|
||||
WX_BEGIN_FLAGS( wxTextCtrlStyle )
|
||||
wxBEGIN_FLAGS( wxTextCtrlStyle )
|
||||
// new style border flags, we put them first to
|
||||
// use them for streaming out
|
||||
WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
|
||||
WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
|
||||
WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
|
||||
WX_FLAGS_MEMBER(wxBORDER_RAISED)
|
||||
WX_FLAGS_MEMBER(wxBORDER_STATIC)
|
||||
WX_FLAGS_MEMBER(wxBORDER_NONE)
|
||||
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
||||
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
||||
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||
|
||||
// old style border flags
|
||||
WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||
WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||
WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
|
||||
WX_FLAGS_MEMBER(wxRAISED_BORDER)
|
||||
WX_FLAGS_MEMBER(wxSTATIC_BORDER)
|
||||
WX_FLAGS_MEMBER(wxNO_BORDER)
|
||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
||||
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
||||
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
||||
wxFLAGS_MEMBER(wxNO_BORDER)
|
||||
|
||||
// standard window styles
|
||||
WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
|
||||
WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
|
||||
WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
||||
WX_FLAGS_MEMBER(wxWANTS_CHARS)
|
||||
WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
||||
WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
||||
WX_FLAGS_MEMBER(wxVSCROLL)
|
||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
||||
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
||||
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
||||
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
||||
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
||||
wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
|
||||
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
||||
wxFLAGS_MEMBER(wxVSCROLL)
|
||||
wxFLAGS_MEMBER(wxHSCROLL)
|
||||
|
||||
WX_FLAGS_MEMBER(wxTE_PROCESS_ENTER)
|
||||
WX_FLAGS_MEMBER(wxTE_PROCESS_TAB)
|
||||
WX_FLAGS_MEMBER(wxTE_MULTILINE)
|
||||
WX_FLAGS_MEMBER(wxTE_PASSWORD)
|
||||
WX_FLAGS_MEMBER(wxTE_READONLY)
|
||||
WX_FLAGS_MEMBER(wxHSCROLL)
|
||||
WX_FLAGS_MEMBER(wxTE_RICH)
|
||||
WX_FLAGS_MEMBER(wxTE_RICH2)
|
||||
WX_FLAGS_MEMBER(wxTE_AUTO_URL)
|
||||
WX_FLAGS_MEMBER(wxTE_NOHIDESEL)
|
||||
WX_FLAGS_MEMBER(wxTE_LEFT)
|
||||
WX_FLAGS_MEMBER(wxTE_CENTRE)
|
||||
WX_FLAGS_MEMBER(wxTE_RIGHT)
|
||||
WX_FLAGS_MEMBER(wxTE_DONTWRAP)
|
||||
WX_FLAGS_MEMBER(wxTE_LINEWRAP)
|
||||
WX_FLAGS_MEMBER(wxTE_WORDWRAP)
|
||||
wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
|
||||
wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
|
||||
wxFLAGS_MEMBER(wxTE_MULTILINE)
|
||||
wxFLAGS_MEMBER(wxTE_PASSWORD)
|
||||
wxFLAGS_MEMBER(wxTE_READONLY)
|
||||
wxFLAGS_MEMBER(wxHSCROLL)
|
||||
wxFLAGS_MEMBER(wxTE_RICH)
|
||||
wxFLAGS_MEMBER(wxTE_RICH2)
|
||||
wxFLAGS_MEMBER(wxTE_AUTO_URL)
|
||||
wxFLAGS_MEMBER(wxTE_NOHIDESEL)
|
||||
wxFLAGS_MEMBER(wxTE_LEFT)
|
||||
wxFLAGS_MEMBER(wxTE_CENTRE)
|
||||
wxFLAGS_MEMBER(wxTE_RIGHT)
|
||||
wxFLAGS_MEMBER(wxTE_DONTWRAP)
|
||||
wxFLAGS_MEMBER(wxTE_LINEWRAP)
|
||||
wxFLAGS_MEMBER(wxTE_WORDWRAP)
|
||||
|
||||
WX_END_FLAGS( wxTextCtrlStyle )
|
||||
wxEND_FLAGS( wxTextCtrlStyle )
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
|
||||
|
||||
WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl)
|
||||
WX_EVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||
WX_EVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
||||
wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
|
||||
wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||
wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
||||
|
||||
WX_PROPERTY( Font , wxFont , SetFont , GetFont ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
||||
WX_PROPERTY( 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
|
||||
WX_END_PROPERTIES_TABLE()
|
||||
wxPROPERTY( Font , wxFont , SetFont , GetFont ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
|
||||
wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
||||
wxEND_PROPERTIES_TABLE()
|
||||
|
||||
WX_BEGIN_HANDLERS_TABLE(wxTextCtrl)
|
||||
WX_END_HANDLERS_TABLE()
|
||||
wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
|
||||
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
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user