X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/634629fa2847aa34c60f4fb20377b3a14f59bfc7..78c91815008ef5888231c6c7f3678872e9e35ff6:/src/common/stockitem.cpp diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index 1946b288ae..9b2d4e2b1e 100644 --- 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) { @@ -90,10 +89,10 @@ bool wxIsStockID(wxWindowID id) default: return false; - }; + } } -wxString wxGetStockLabel(wxWindowID id, bool withCodes, wxString accelerator) +wxString wxGetStockLabel(wxWindowID id, bool withCodes, const wxString& accelerator) { wxString stockLabel;