From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 26 Jun 2008 12:44:14 +0000 (+0000)
Subject: still support wxNB_XXX and wxADJUST_MINSIZE in XRC files even if they're deprecated... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/249259e7535fbe6e5aa42db24aad3fc07f46160c

still support wxNB_XXX and wxADJUST_MINSIZE in XRC files even if they're deprecated at C++ level, not all tools have been updated to not use them any more

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 7c0217f9c8..01a280ef26 100644
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -40,13 +40,12 @@ wxNotebookXmlHandler::wxNotebookXmlHandler()
     XRC_ADD_STYLE(wxBK_TOP);
     XRC_ADD_STYLE(wxBK_BOTTOM);
 
-#if WXWIN_COMPATIBILITY_2_6
+    // provide the old synonyms for these fields as well
     XRC_ADD_STYLE(wxNB_DEFAULT);
     XRC_ADD_STYLE(wxNB_LEFT);
     XRC_ADD_STYLE(wxNB_RIGHT);
     XRC_ADD_STYLE(wxNB_TOP);
     XRC_ADD_STYLE(wxNB_BOTTOM);
-#endif
 
     XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
     XRC_ADD_STYLE(wxNB_MULTILINE);
diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 2e6bc72c4a..8b86cce220 100644
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -81,6 +81,11 @@ wxSizerXmlHandler::wxSizerXmlHandler()
     XRC_ADD_STYLE(wxFIXED_MINSIZE);
     XRC_ADD_STYLE(wxRESERVE_SPACE_EVEN_IF_HIDDEN);
 
+    // this flag doesn't do anything any more but we can just ignore its
+    // occurrences in the old resource files instead of raising a fuss because
+    // of it
+    AddStyle("wxADJUST_MINSIZE", 0);
+
     // wxWrapSizer-specific flags
     XRC_ADD_STYLE(wxEXTEND_LAST_ON_EACH_LINE);
     XRC_ADD_STYLE(wxREMOVE_LEADING_SPACES);