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

Recognize old wx{CHB,LB}_XXX styles in XRC.

Browse Source 
Situation with wxBK_XXX vs wxXXB_XXX remains confusing, the comments in the
code suggest that the former is preferred but the latter are documented for
wxListbook and wxChoicebook (although they don't even exist for wxTreebook).
So it seems unwise to not recognize the wxXXB_XXX versions in XRC as people
could easily decide to use them instead of wxBK_XXX values -- and this is also
consisten with wxNotebookXmlHandler which does recognize both wxBK_XXX and
wxNB_XXX already.

Change wxListbookXmlHandler and wxChoicebookXmlHandler to also always
recognize these styles.

Closes #10725.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-09-21 20:10:54 +00:00
parent 44c2703fbf
commit 8a72770aa6
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xrc/xh_choicbk.cpp
View File

@ -40,13 +40,11 @@ wxChoicebookXmlHandler::wxChoicebookXmlHandler()
XRC_ADD_STYLE(wxBK_TOP); XRC_ADD_STYLE(wxBK_TOP);
XRC_ADD_STYLE(wxBK_BOTTOM); XRC_ADD_STYLE(wxBK_BOTTOM);
#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxCHB_DEFAULT); XRC_ADD_STYLE(wxCHB_DEFAULT);
XRC_ADD_STYLE(wxCHB_LEFT); XRC_ADD_STYLE(wxCHB_LEFT);
XRC_ADD_STYLE(wxCHB_RIGHT); XRC_ADD_STYLE(wxCHB_RIGHT);
XRC_ADD_STYLE(wxCHB_TOP); XRC_ADD_STYLE(wxCHB_TOP);
XRC_ADD_STYLE(wxCHB_BOTTOM); XRC_ADD_STYLE(wxCHB_BOTTOM);
#endif
AddWindowStyles(); AddWindowStyles();
} }

2
src/xrc/xh_listbk.cpp
View File

@ -40,13 +40,11 @@ wxListbookXmlHandler::wxListbookXmlHandler()
XRC_ADD_STYLE(wxBK_TOP); XRC_ADD_STYLE(wxBK_TOP);
XRC_ADD_STYLE(wxBK_BOTTOM); XRC_ADD_STYLE(wxBK_BOTTOM);
#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxLB_DEFAULT); XRC_ADD_STYLE(wxLB_DEFAULT);
XRC_ADD_STYLE(wxLB_LEFT); XRC_ADD_STYLE(wxLB_LEFT);
XRC_ADD_STYLE(wxLB_RIGHT); XRC_ADD_STYLE(wxLB_RIGHT);
XRC_ADD_STYLE(wxLB_TOP); XRC_ADD_STYLE(wxLB_TOP);
XRC_ADD_STYLE(wxLB_BOTTOM); XRC_ADD_STYLE(wxLB_BOTTOM);
#endif
AddWindowStyles(); AddWindowStyles();
} }