Deprecated and obsolete parts marked up for backward compatibility.

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

diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
index ad9cf55656eedfe1773942f89d885fc3f9283b33..cbef29444b532645a1c4923c7d7ae5a1d5680ee2 100644 (file)
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ b/contrib/utils/convertrc/wxr2xml.cpp
@@ -422,8 +422,10 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
             s += _T("wxCAPTION|");
         if (style & wxRESIZE_BORDER)
             s += _T("wxRESIZE_BORDER|");
             s += _T("wxCAPTION|");
         if (style & wxRESIZE_BORDER)
             s += _T("wxRESIZE_BORDER|");

+#if WXWIN_COMPATIBILITY_2_6

         if (style & wxRESIZE_BOX)
             s += _T("wxRESIZE_BOX|");
         if (style & wxRESIZE_BOX)
             s += _T("wxRESIZE_BOX|");

+#endif // WXWIN_COMPATIBILITY_2_6

         if (style & wxRESIZE_BORDER)
             s += _T("wxRESIZE_BORDER|");
         if (style & wxSYSTEM_MENU)
         if (style & wxRESIZE_BORDER)
             s += _T("wxRESIZE_BORDER|");
         if (style & wxSYSTEM_MENU)