recognize wxBORDER_XXX as well as wxXXX_BORDER styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -786,12 +786,15 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
|
||||
void wxXmlResourceHandler::AddWindowStyles()
|
||||
{
|
||||
XRC_ADD_STYLE(wxCLIP_CHILDREN);
|
||||
XRC_ADD_STYLE(wxSIMPLE_BORDER);
|
||||
XRC_ADD_STYLE(wxSUNKEN_BORDER);
|
||||
XRC_ADD_STYLE(wxDOUBLE_BORDER);
|
||||
XRC_ADD_STYLE(wxRAISED_BORDER);
|
||||
XRC_ADD_STYLE(wxSTATIC_BORDER);
|
||||
XRC_ADD_STYLE(wxNO_BORDER);
|
||||
|
||||
// the border styles all have the old and new names, recognize both for now
|
||||
XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
|
||||
XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
|
||||
XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE);
|
||||
XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
|
||||
XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
|
||||
XRC_ADD_STYLE(wxNO_BORDER); XRC_ADD_STYLE(wxBORDER_NONE);
|
||||
|
||||
XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
|
||||
XRC_ADD_STYLE(wxWANTS_CHARS);
|
||||
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
|
||||
|
Reference in New Issue
Block a user