Ambiguous overload fix for gcc

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 1946b288aed0355ea5eea4d0cb049604c579fe36..c1b7d71ad8f51c5fab8c0e7dcc9854fcf9a2c326 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -90,10 +86,10 @@ bool wxIsStockID(wxWindowID id)
 
         default:
             return false;
 
         default:
             return false;

-    };
+    }

 }
 
 }
 

-wxString wxGetStockLabel(wxWindowID id, bool withCodes, wxString accelerator)
+wxString wxGetStockLabel(wxWindowID id, bool withCodes, const wxString& accelerator)

 {
     wxString stockLabel;
 
 {
     wxString stockLabel;