From 8a72770aa682c6b4ea8efa7f5d4ed5e5fa1bcfa6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 21 Sep 2009 20:10:54 +0000 Subject: [PATCH] Recognize old wx{CHB,LB}_XXX styles in XRC. 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 --- src/xrc/xh_choicbk.cpp | 2 -- src/xrc/xh_listbk.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp index 16b9afcd25..f2bd34de21 100644 --- a/src/xrc/xh_choicbk.cpp +++ b/src/xrc/xh_choicbk.cpp @@ -40,13 +40,11 @@ wxChoicebookXmlHandler::wxChoicebookXmlHandler() XRC_ADD_STYLE(wxBK_TOP); XRC_ADD_STYLE(wxBK_BOTTOM); -#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxCHB_DEFAULT); XRC_ADD_STYLE(wxCHB_LEFT); XRC_ADD_STYLE(wxCHB_RIGHT); XRC_ADD_STYLE(wxCHB_TOP); XRC_ADD_STYLE(wxCHB_BOTTOM); -#endif AddWindowStyles(); } diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp index 1d3fb67c58..7d4f64ae98 100644 --- a/src/xrc/xh_listbk.cpp +++ b/src/xrc/xh_listbk.cpp @@ -40,13 +40,11 @@ wxListbookXmlHandler::wxListbookXmlHandler() XRC_ADD_STYLE(wxBK_TOP); XRC_ADD_STYLE(wxBK_BOTTOM); -#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxLB_DEFAULT); XRC_ADD_STYLE(wxLB_LEFT); XRC_ADD_STYLE(wxLB_RIGHT); XRC_ADD_STYLE(wxLB_TOP); XRC_ADD_STYLE(wxLB_BOTTOM); -#endif AddWindowStyles(); } -- 2.45.2