[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 2838320cb864d9f25b0985b2de6e6bd130188263..9b2d4e2b1e8e92936edbfa257f3624fd202bbc26 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/stockitem.cpp
+// Name:        src/common/stockitem.cpp
 // Purpose:     Stock buttons, menu and toolbar items labels
 // Author:      Vaclav Slavik
 // Modified by:
@@ -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"
 
@@ -29,8 +25,11 @@
 #endif
 
 #include "wx/stockitem.h"
-#include "wx/intl.h"
-#include "wx/utils.h" // for wxStripMenuCodes()
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/utils.h" // for wxStripMenuCodes()
+#endif
 
 bool wxIsStockID(wxWindowID id)
 {
@@ -93,7 +92,7 @@ bool wxIsStockID(wxWindowID id)
     }
 }
 
-wxString wxGetStockLabel(wxWindowID id, bool withCodes, wxString accelerator)
+wxString wxGetStockLabel(wxWindowID id, bool withCodes, const wxString& accelerator)
 {
     wxString stockLabel;