Fill in more details for the wxEVT_STC_AUTOCOMP_SELECTION event

[wxWidgets.git] / contrib / utils / convertrc / wxr2xml.cpp

diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
index cb5ecc7b3cd589f95872d803a8285ce82354da18..cbef29444b532645a1c4923c7d7ae5a1d5680ee2 100644 (file)
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ b/contrib/utils/convertrc/wxr2xml.cpp
@@ -1,7 +1,7 @@
 // wxr2xml.cpp: implementation of the wxr2xml class.
 // 8/30/00  Brian Gavin
 // only tested on wxMSW so far
-//License: wxWindows Liscense
+// License: wxWindows Liscense
 // ////////////////////////////////////////////////////////////////////
 
 /*
@@ -31,12 +31,10 @@ trans->Convert("Myfile.wxr","Myfile.xml");
 
 wxr2xml::wxr2xml()
 {
-
 }
 
 wxr2xml::~wxr2xml()
 {
-
 }
 
 bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
@@ -404,14 +402,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,10 +420,12 @@ 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 WXWIN_COMPATIBILITY_2_6
         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)
@@ -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)
@@ -462,8 +466,6 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
             s += _T("wxGA_HORIZONTAL|");
         if (style & wxGA_VERTICAL)
             s += _T("wxGA_VERTICAL|");
-        if (style & wxGA_PROGRESSBAR)
-            s += _T("wxGA_PROGRESSBAR|");
     // windows only
         if (style & wxGA_SMOOTH)
             s += _T("wxGA_SMOOTH|");
@@ -536,11 +538,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 +604,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 +622,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 +632,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())