From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 19 Feb 2011 12:32:59 +0000 (+0000)
Subject: Move "static" keyword out from wxDEPRECATED() macros to placate icc.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d65e9d5707e2e80127ef85927d191c4911169f13?ds=inline

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
---

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 2dbf51a23a..7eef3973c4 100644
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -136,7 +136,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_8
     // use PushBack(), it's the same thing
-    wxDEPRECATED( static void Insert(wxArtProvider *provider) );
+    static wxDEPRECATED( void Insert(wxArtProvider *provider) );
 #endif
 
     // Remove latest added provider and delete it.
@@ -189,14 +189,14 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_6
     // use the corresponding methods without redundant "Provider" suffix
-    wxDEPRECATED( static void PushProvider(wxArtProvider *provider) );
-    wxDEPRECATED( static void InsertProvider(wxArtProvider *provider) );
-    wxDEPRECATED( static bool PopProvider() );
+    static wxDEPRECATED( void PushProvider(wxArtProvider *provider) );
+    static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) );
+    static wxDEPRECATED( bool PopProvider() );
 
     // 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
     // unlike RemoveProvider() which does
-    wxDEPRECATED( static bool RemoveProvider(wxArtProvider *provider) );
+    static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) );
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
diff --git a/include/wx/colour.h b/include/wx/colour.h
index 3de95570f1..cf19ba4838 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -172,7 +172,7 @@ public:
     // ---------------
 
 #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) );
 #endif
 
diff --git a/include/wx/image.h b/include/wx/image.h
index bfb2129881..43e7115ea0 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -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);
         }
diff --git a/include/wx/log.h b/include/wx/log.h
index 7190314658..8f872af38e 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -522,14 +522,14 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_6
     // this function doesn't do anything any more, don't call it
-    wxDEPRECATED_INLINE(
-        static wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL;
+    static wxDEPRECATED_INLINE(
+        wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL;
     );
 #endif // WXWIN_COMPATIBILITY_2_6
 
     // don't use integer masks any more, use string trace masks instead
 #if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE( static void SetTraceMask(wxTraceMask ulMask),
+    static wxDEPRECATED_INLINE( void SetTraceMask(wxTraceMask ulMask),
         ms_ulTraceMask = ulMask; )
 
     // this one can't be marked deprecated as it's used in our own wxLogger
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 51ce402b49..9dfb98e094 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -127,7 +127,7 @@ public:
     wxDEPRECATED( const wxString& GetText() const );
 
     // Now use GetLabelText to strip the accelerators
-    wxDEPRECATED( static wxString GetLabelFromText(const wxString& text) );
+    static wxDEPRECATED( wxString GetLabelFromText(const wxString& text) );
 
     // Now use SetItemLabel
     wxDEPRECATED( virtual void SetText(const wxString& str) );
diff --git a/include/wx/validate.h b/include/wx/validate.h
index f6832d16d1..27473364bc 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -74,8 +74,8 @@ public:
     // unnaturally: it disabled the bell when it was true, not false as could
     // be expected; use SuppressBellOnError() instead
 #if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(
-        static void SetBellOnError(bool doIt = true),
+    static wxDEPRECATED_INLINE(
+        void SetBellOnError(bool doIt = true),
         ms_isSilent = doIt;
     )
 #endif