Applied patch [ 608850 ] wxX11 menu accelerators need toupper

[wxWidgets.git] / utils / wxrc / wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index ca65863eaf6f3df907f51ab327edb81933847a0a..23b27952a7d38fd2558cc9463019d12baa00f582 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation
     #pragma interface
 #endif
     #pragma implementation
     #pragma interface
 #endif


@@ -514,7 +514,7 @@ void XmlResApp::OutputGettext()
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)

-        fout.Write(_T("_(\"") + str[i] + _T("\")\n"));
+        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));

     
     if (!parOutput) fout.Detach();
 }
     
     if (!parOutput) fout.Detach();
 }


@@ -601,7 +601,8 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||

-                node/*not n!*/->GetName() == _T("title")
+                node/*not n!*/->GetName() == _T("title") ||
+                node/*not n!*/->GetName() == _T("item")

             ))
             // ...and known to contain translatable string
         {
             ))
             // ...and known to contain translatable string
         {