Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / effects.h

diff --git a/include/wx/effects.h b/include/wx/effects.h
index 1ad96f4ec68d8b02fb4567130d4513ea546aa6bf..adaf951c10253e37d9fd7949e86516781c6c13d4 100644 (file)
--- a/include/wx/effects.h
+++ b/include/wx/effects.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     25/4/2000
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     25/4/2000

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,24 +12,30 @@
 #ifndef _WX_EFFECTS_H_
 #define _WX_EFFECTS_H_
 
 #ifndef _WX_EFFECTS_H_
 #define _WX_EFFECTS_H_
 

+// this class is deprecated and will be removed in the next wx version
+//
+// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
+// replacement for TileBitmap() but it doesn't seem to be very useful anyhow
+#if WXWIN_COMPATIBILITY_2_8
+

 /*
  * wxEffects: various 3D effects
  */
 
 #include "wx/object.h"
 #include "wx/colour.h"
 /*
  * wxEffects: various 3D effects
  */
 
 #include "wx/object.h"
 #include "wx/colour.h"

+#include "wx/gdicmn.h"
+#include "wx/dc.h"

 
 

-class WXDLLEXPORT wxEffects: public wxObject
+class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject

 {
 {

-DECLARE_CLASS(wxEffects)
-

 public:
     // Assume system colours
 public:
     // Assume system colours

-    wxEffects() ;
+    wxEffectsImpl() ;

     // Going from lightest to darkest
     // Going from lightest to darkest

-    wxEffects(const wxColour& highlightColour, const wxColour& lightShadow,
-              const wxColour& faceColour, const wxColour& mediumShadow,
-              const wxColour& darkShadow) ;
+    wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
+                  const wxColour& faceColour, const wxColour& mediumShadow,
+                  const wxColour& darkShadow) ;

 
     // Accessors
     wxColour GetHighlightColour() const { return m_highlightColour; }
 
     // Accessors
     wxColour GetHighlightColour() const { return m_highlightColour; }


@@ -68,6 +73,18 @@ protected:
     wxColour    m_faceColour;       // Usually grey
     wxColour    m_mediumShadow;     // Usually dark grey
     wxColour    m_darkShadow;       // Usually black
     wxColour    m_faceColour;       // Usually grey
     wxColour    m_mediumShadow;     // Usually dark grey
     wxColour    m_darkShadow;       // Usually black

+
+    DECLARE_CLASS(wxEffectsImpl)

 };
 
 };
 

-#endif
+// current versions of g++ don't generate deprecation warnings for classes
+// declared deprecated, so define wxEffects as a typedef instead: this does
+// generate warnings with both g++ and VC (which also has no troubles with
+// directly deprecating the classes...)
+//
+// note that this g++ bug (16370) is supposed to be fixed in g++ 4.3.0
+typedef wxEffectsImpl wxDEPRECATED(wxEffects);
+
+#endif // WXWIN_COMPATIBILITY_2_8
+
+#endif // _WX_EFFECTS_H_