fixing compilo for 10.5

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index eadd15283b657e9b1260cf8e96d2971780611419..303e31881fb976462a922ccb4820b30d8c9febfe 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -941,8 +941,10 @@ wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
     return out;
 }
 
     return out;
 }
 

-wxString wxStripMenuCodes(const wxString& in)
+wxString wxStripMenuCodes(const wxString& in, int flags)

 {
 {

+    wxASSERT_MSG( flags, _T("this is useless to call without any flags") );
+

     wxString out;
 
     size_t len = in.length();
     wxString out;
 
     size_t len = in.length();


@@ -951,7 +953,7 @@ wxString wxStripMenuCodes(const wxString& in)
     for ( size_t n = 0; n < len; n++ )
     {
         wxChar ch = in[n];
     for ( size_t n = 0; n < len; n++ )
     {
         wxChar ch = in[n];

-        if ( ch == _T('&') )
+        if ( (flags & wxStrip_Mnemonics) && ch == _T('&') )

         {
             // skip it, it is used to introduce the accel char (or to quote
             // itself in which case it should still be skipped): note that it
         {
             // skip it, it is used to introduce the accel char (or to quote
             // itself in which case it should still be skipped): note that it


@@ -966,7 +968,7 @@ wxString wxStripMenuCodes(const wxString& in)
                 ch = in[n];
             }
         }
                 ch = in[n];
             }
         }

-        else if ( ch == _T('\t') )
+        else if ( (flags & wxStrip_Accel) && ch == _T('\t') )

         {
             // everything after TAB is accel string, exit the loop
             break;
         {
             // everything after TAB is accel string, exit the loop
             break;