Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move "static" keyword out from wxDEPRECATED() macros to placate icc.

Browse Source 
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:
Vadim Zeitlin
2011-02-19 12:32:59 +00:00
parent 16c7d85b34
commit d65e9d5707
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/artprov.h
View File

@@ -136,7 +136,7 @@ public:
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
// use PushBack(), it's the same thing // use PushBack(), it's the same thing
wxDEPRECATED( static void Insert(wxArtProvider *provider) ); static wxDEPRECATED( void Insert(wxArtProvider *provider) );
#endif #endif
// Remove latest added provider and delete it. // Remove latest added provider and delete it.
@@ -189,14 +189,14 @@ public:
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
// use the corresponding methods without redundant "Provider" suffix // use the corresponding methods without redundant "Provider" suffix
wxDEPRECATED( static void PushProvider(wxArtProvider *provider) ); static wxDEPRECATED( void PushProvider(wxArtProvider *provider) );
wxDEPRECATED( static void InsertProvider(wxArtProvider *provider) ); static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) );
wxDEPRECATED( static bool PopProvider() ); static wxDEPRECATED( bool PopProvider() );
// use Delete() if this is what you really need, or just delete the // use Delete() if this is what you really need, or just delete the
// provider pointer, do not use Remove() as it does not delete the pointer // provider pointer, do not use Remove() as it does not delete the pointer
// unlike RemoveProvider() which does // unlike RemoveProvider() which does
wxDEPRECATED( static bool RemoveProvider(wxArtProvider *provider) ); static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) );
#endif // WXWIN_COMPATIBILITY_2_6 #endif // WXWIN_COMPATIBILITY_2_6
protected: protected:

2
include/wx/colour.h
View File

@@ -172,7 +172,7 @@ public:
// --------------- // ---------------
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( static wxColour CreateByName(const wxString& name) ); static wxDEPRECATED( wxColour CreateByName(const wxString& name) );
wxDEPRECATED( void InitFromName(const wxString& col) ); wxDEPRECATED( void InitFromName(const wxString& col) );
#endif #endif

8
include/wx/image.h
View File

@@ -561,15 +561,15 @@ public:
} }
) )
wxDEPRECATED( static wxDEPRECATED(
static wxImageHandler *FindHandler(const wxString& ext, long type) wxImageHandler *FindHandler(const wxString& ext, long type)
{ {
return FindHandler(ext, (wxBitmapType)type); return FindHandler(ext, (wxBitmapType)type);
} }
) )
wxDEPRECATED( static wxDEPRECATED(
static wxImageHandler *FindHandler(long imageType) wxImageHandler *FindHandler(long imageType)
{ {
return FindHandler((wxBitmapType)imageType); return FindHandler((wxBitmapType)imageType);
} }

6
include/wx/log.h
View File

@@ -522,14 +522,14 @@ public:
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
// this function doesn't do anything any more, don't call it // this function doesn't do anything any more, don't call it
wxDEPRECATED_INLINE( static wxDEPRECATED_INLINE(
static wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL; wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL;
); );
#endif // WXWIN_COMPATIBILITY_2_6 #endif // WXWIN_COMPATIBILITY_2_6
// don't use integer masks any more, use string trace masks instead // don't use integer masks any more, use string trace masks instead
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED_INLINE( static void SetTraceMask(wxTraceMask ulMask), static wxDEPRECATED_INLINE( void SetTraceMask(wxTraceMask ulMask),
ms_ulTraceMask = ulMask; ) ms_ulTraceMask = ulMask; )
// this one can't be marked deprecated as it's used in our own wxLogger // this one can't be marked deprecated as it's used in our own wxLogger

2
include/wx/menuitem.h
View File

@@ -127,7 +127,7 @@ public:
wxDEPRECATED( const wxString& GetText() const ); wxDEPRECATED( const wxString& GetText() const );
// Now use GetLabelText to strip the accelerators // Now use GetLabelText to strip the accelerators
wxDEPRECATED( static wxString GetLabelFromText(const wxString& text) ); static wxDEPRECATED( wxString GetLabelFromText(const wxString& text) );
// Now use SetItemLabel // Now use SetItemLabel
wxDEPRECATED( virtual void SetText(const wxString& str) ); wxDEPRECATED( virtual void SetText(const wxString& str) );

4
include/wx/validate.h
View File

@@ -74,8 +74,8 @@ public:
// unnaturally: it disabled the bell when it was true, not false as could // unnaturally: it disabled the bell when it was true, not false as could
// be expected; use SuppressBellOnError() instead // be expected; use SuppressBellOnError() instead
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED_INLINE( static wxDEPRECATED_INLINE(
static void SetBellOnError(bool doIt = true), void SetBellOnError(bool doIt = true),
ms_isSilent = doIt; ms_isSilent = doIt;
) )
#endif #endif