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

Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-31 18:07:22 +00:00
parent ed177375b2
commit 1c067fe3c1
36 changed files with 243 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -153,7 +153,7 @@ wxFprintf(m_wxr,_T("static char *dialog%i = \"dialog(name = '%s',\\\n"),dlgid,dl
//be lazy about style for now. add it later
wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n"));
wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\\\n"));
wxFprintf(m_wxr,_T("id = %i,\\\n"),dlgid);
//Record x,y,width,height
@@ -795,4 +795,3 @@ void rc2wxr::ParseCtrlButton(wxString label, wxString varname)
wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
}
}

23
contrib/utils/convertrc/wxr2xml.cpp
View File

@@ -404,14 +404,16 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
if (restype == _T("wxDialog"))
{
if (style & wxDIALOG_MODAL)
s += _T("wxDIALOG_MODAL|");
if (style & wxDEFAULT_DIALOG_STYLE)
s += _T("wxDEFAULT_DIALOG_STYLE|");
#if WXWIN_COMPATIBILITY_2_6
if (style & wxDIALOG_MODAL)
s += _T("wxDIALOG_MODAL|");
if (style & wxDIALOG_MODELESS)
s += _T("wxDIALOG_MODELESS|");
if (style & wxNO_3D)
s += _T("wxNO_3D|");
#endif // WXWIN_COMPATIBILITY_2_6
if (style & wxTAB_TRAVERSAL)
s += _T("wxTAB_TRAVERSAL|");
if (style & wxWS_EX_VALIDATE_RECURSIVELY)
@@ -420,8 +422,8 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxSTAY_ON_TOP|");
if (style & wxCAPTION)
s += _T("wxCAPTION|");
if (style & wxTHICK_FRAME)
s += _T("wxTHICK_FRAME|");
if (style & wxRESIZE_BORDER)
s += _T("wxRESIZE_BORDER|");
if (style & wxRESIZE_BOX)
s += _T("wxRESIZE_BOX|");
if (style & wxRESIZE_BORDER)
@@ -436,8 +438,10 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
{
if (style & wxCLIP_CHILDREN)
s += _T("wxCLIP_CHILDREN|");
#if WXWIN_COMPATIBILITY_2_6
if (style & wxNO_3D)
s += _T("wxNO_3D|");
#endif // WXWIN_COMPATIBILITY_2_6
if (style & wxTAB_TRAVERSAL)
s += _T("wxTAB_TRAVERSAL|");
if (style & wxWS_EX_VALIDATE_RECURSIVELY)
@@ -536,11 +540,10 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxSB_VERTICAL|");
}
int l;
l = s.Length();
int l = s.length();
// No styles defined
if (l == 11)
return _T("");
return wxEmptyString;
// Trim off last |
s = s.Truncate(l - 1);
@@ -603,7 +606,7 @@ void wxr2xml::ParseMenu(wxItemResource * res)
m_xmlfile.Write(_T(">\n"));
m_xmlfile.Write(_T("\t\t\t\t<label>")
+ FixMenuString(res->GetTitle()) + _T("</label>\n"));
if (res->GetValue4() != _T(""))
if (!res->GetValue4().empty())
m_xmlfile.Write(_T("\t\t\t\t<help>") + res->GetValue4() +
_T("</help>\n"));
// Read in menu items and additional menus
@@ -621,7 +624,7 @@ void wxr2xml::ParseMenu(wxItemResource * res)
void wxr2xml::ParseMenuItem(wxItemResource * res)
{
// Get Menu Item or Separator
if (res->GetTitle() == _T("")) {
if (res->GetTitle().empty()) {
m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));
} else {
m_xmlfile.Write(_T("\t\t\t\t<object class=\"wxMenuItem\" "));
@@ -631,7 +634,7 @@ void wxr2xml::ParseMenuItem(wxItemResource * res)
m_xmlfile.Write(_T(">\n"));
m_xmlfile.Write(_T("\t\t\t<label>")
+ FixMenuString(res->GetTitle()) + _T("</label>\n"));
if (res->GetValue4() != _T(""))
if (!res->GetValue4().empty())
m_xmlfile.Write(_T("\t\t\t<help>") +
res->GetValue4() + _T("</help>\n"));
if (res->GetValue2())