Move "static" keyword out from wxDEPRECATED() macros to placate icc.
Intel compiler gives warnings if the static keyword is not at the beginning of the declaration and this happened when using it inside wxDEPRECATED() and related macros because the declaration started with __declspec(deprecated) or __attribute__((deprecated)) instead. To avoid this problem, simply move "static" outside the macro. Closes #12932. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -561,15 +561,15 @@ public:
|
||||
}
|
||||
)
|
||||
|
||||
wxDEPRECATED(
|
||||
static wxImageHandler *FindHandler(const wxString& ext, long type)
|
||||
static wxDEPRECATED(
|
||||
wxImageHandler *FindHandler(const wxString& ext, long type)
|
||||
{
|
||||
return FindHandler(ext, (wxBitmapType)type);
|
||||
}
|
||||
)
|
||||
|
||||
wxDEPRECATED(
|
||||
static wxImageHandler *FindHandler(long imageType)
|
||||
static wxDEPRECATED(
|
||||
wxImageHandler *FindHandler(long imageType)
|
||||
{
|
||||
return FindHandler((wxBitmapType)imageType);
|
||||
}
|
||||
|
Reference in New Issue
Block a user