macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -56,59 +56,59 @@
|
||||
#if wxUSE_EXTENDED_RTTI
|
||||
WX_DEFINE_FLAGS( wxComboBoxStyle )
|
||||
|
||||
WX_BEGIN_FLAGS( wxComboBoxStyle )
|
||||
wxBEGIN_FLAGS( wxComboBoxStyle )
|
||||
// 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(wxCB_SIMPLE)
|
||||
WX_FLAGS_MEMBER(wxCB_SORT)
|
||||
WX_FLAGS_MEMBER(wxCB_READONLY)
|
||||
WX_FLAGS_MEMBER(wxCB_DROPDOWN)
|
||||
wxFLAGS_MEMBER(wxCB_SIMPLE)
|
||||
wxFLAGS_MEMBER(wxCB_SORT)
|
||||
wxFLAGS_MEMBER(wxCB_READONLY)
|
||||
wxFLAGS_MEMBER(wxCB_DROPDOWN)
|
||||
|
||||
WX_END_FLAGS( wxComboBoxStyle )
|
||||
wxEND_FLAGS( wxComboBoxStyle )
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
|
||||
|
||||
WX_BEGIN_PROPERTIES_TABLE(wxComboBox)
|
||||
WX_EVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
|
||||
WX_EVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
||||
wxBEGIN_PROPERTIES_TABLE(wxComboBox)
|
||||
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
|
||||
wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
|
||||
|
||||
// TODO DELEGATES
|
||||
WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
WX_PROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
WX_PROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
WX_PROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , 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_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
wxPROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
wxPROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
|
||||
wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
||||
wxEND_PROPERTIES_TABLE()
|
||||
|
||||
WX_BEGIN_HANDLERS_TABLE(wxComboBox)
|
||||
WX_END_HANDLERS_TABLE()
|
||||
wxBEGIN_HANDLERS_TABLE(wxComboBox)
|
||||
wxEND_HANDLERS_TABLE()
|
||||
|
||||
WX_CONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
|
||||
wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
|
||||
#else
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user