Ambiguous overload fix for gcc

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 80fd5e25f555af7f1f003dcebf1ae163d10e23dc..c1b7d71ad8f51c5fab8c0e7dcc9854fcf9a2c326 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "stockitem.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -30,7 +26,7 @@
 
 #include "wx/stockitem.h"
 #include "wx/intl.h"
-
+#include "wx/utils.h" // for wxStripMenuCodes()
 
 bool wxIsStockID(wxWindowID id)
 {
@@ -90,14 +86,17 @@ bool wxIsStockID(wxWindowID id)
 
         default:
             return false;
-    };
+    }
 }
 
-wxString wxGetStockLabel(wxWindowID id)
+wxString wxGetStockLabel(wxWindowID id, bool withCodes, const wxString& accelerator)
 {
+    wxString stockLabel;
+
     #define STOCKITEM(stockid, label) \
         case stockid:                 \
-            return label;
+            stockLabel = label;       \
+            break;
 
     switch (id)
     {
@@ -158,8 +157,18 @@ wxString wxGetStockLabel(wxWindowID id)
     };
 
     #undef STOCKITEM
-    
-    return wxEmptyString;
+
+    if(!withCodes)
+    {
+        stockLabel = wxStripMenuCodes( stockLabel );
+    }
+    else if (!stockLabel.empty() && !accelerator.empty())
+    {
+        stockLabel += _T("\t");
+        stockLabel += accelerator;
+    }
+
+    return stockLabel;
 }
 
 bool wxIsStockLabel(wxWindowID id, const wxString& label)
@@ -171,11 +180,11 @@ bool wxIsStockLabel(wxWindowID id, const wxString& label)
 
     if (label == stock)
         return true;
-    
+
     stock.Replace(_T("&"), wxEmptyString);
     if (label == stock)
         return true;
-    
+
     return false;
 }
 
@@ -189,9 +198,9 @@ const char *wxGetStockGtkID(wxWindowID id)
     #define STOCKITEM(wx,gtk)      \
         case wx:                   \
             return gtk;
-    
+
     #define STOCKITEM_MISSING(wx)  \
-        case wxid:                 \
+        case wx:                 \
             return NULL;
 
     #if GTK_CHECK_VERSION(2,4,0)
@@ -259,7 +268,7 @@ const char *wxGetStockGtkID(wxWindowID id)
     };
 
     #undef STOCKITEM
-    
+
     return NULL;
 }