diff --git a/include/wx/brush.h b/include/wx/brush.h
index fa0103cf4d..7ad451927c 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -55,11 +55,6 @@ public:
 
     virtual bool IsHatch() const
         { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
 };
 
 #if defined(__WXPALMOS__)
diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 965e35f109..47970da8cc 100644
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -55,6 +55,11 @@ public:
     virtual wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     // wxCocoa
     WX_NSColor GetNSColor();
 
diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 73f7c568f1..279f3d3894 100644
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -54,6 +54,12 @@ public:
     int GetDashes(wxDash **ptr) const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
+    // Cocoa-specific
     WX_NSColor GetNSColor();
     int GetCocoaLineDash(const CGFloat **pattern);
 
diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h
index c2360bef88..47799b7e84 100644
--- a/include/wx/dfb/brush.h
+++ b/include/wx/dfb/brush.h
@@ -50,6 +50,11 @@ public:
     void SetStyle(wxBrushStyle style);
     void SetStipple(const wxBitmap& stipple);
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h
index 27fe9a9be6..00e1f783be 100644
--- a/include/wx/dfb/pen.h
+++ b/include/wx/dfb/pen.h
@@ -61,6 +61,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 5c3e1d7ab6..848fdf8cc5 100644
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -41,6 +41,11 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 2af7d46048..4f1a3cf7ed 100644
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -50,6 +50,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index c7ea67babe..7a44ae2a33 100644
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -51,6 +51,11 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 private:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 887a77951c..97fea928a3 100644
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -64,6 +64,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 private:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 6dd2b763a6..ec06a3821e 100644
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -49,6 +49,11 @@ public:
     void SetStyle(wxBrushStyle style);
     void SetStipple(const wxBitmap& stipple);
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     // implementation:
 
     void* GetMaskPattern() const;
diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index cd7188c465..6454bee1b2 100644
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -60,6 +60,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
     // implementation:
     void* GetPixPattern() const;
 
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 3d1c7e3ae1..d4ddc8d813 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -43,6 +43,11 @@ public:
     wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 0cff049e87..ab4deee8b6 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -55,6 +55,11 @@ public:
     int GetDashCount() const;
     wxBitmap* GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
     // internal: wxGDIObject methods
     virtual bool RealizeResource();
     virtual bool FreeResource(bool force = false);
diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index c3dcfe85a3..c13dcf00fb 100644
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -40,6 +40,11 @@ public:
     wxBitmap* GetStipple(void) const;
     int       GetPS(void) const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     //
     // Implementation
     //
diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index f05f6382f6..5907125fc8 100644
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -69,6 +69,11 @@ public:
     int       GetDashCount() const;
     wxBitmap* GetStipple(void) const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
     //
     // Implementation
     //
diff --git a/include/wx/osx/carbon/brush.h b/include/wx/osx/carbon/brush.h
index 0d4d1c5586..68778697e2 100644
--- a/include/wx/osx/carbon/brush.h
+++ b/include/wx/osx/carbon/brush.h
@@ -42,6 +42,11 @@ public:
     wxBrushStyle GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/osx/carbon/pen.h b/include/wx/osx/carbon/pen.h
index 3807aa523e..a5ae6095e3 100644
--- a/include/wx/osx/carbon/pen.h
+++ b/include/wx/osx/carbon/pen.h
@@ -52,6 +52,11 @@ public:
 
     wxBitmap *GetStipple() const ;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
     // Implementation
 
     // Useful helper: create the brush resource
diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index ba55d5bad7..3625ad9fd5 100644
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -45,6 +45,11 @@ public:
     wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index aa8e644314..4dd60758b9 100644
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -125,6 +125,11 @@ public:
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 53069c51e5..ec705d9e40 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -84,33 +84,28 @@ public:
     virtual wxPenCap GetCap() const = 0;
     virtual int GetWidth() const = 0;
     virtual int GetDashes(wxDash **ptr) const = 0;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
 };
 
 #if defined(__WXPALMOS__)
-#include "wx/palmos/pen.h"
+    #include "wx/palmos/pen.h"
 #elif defined(__WXMSW__)
-#include "wx/msw/pen.h"
+    #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
-#include "wx/x11/pen.h"
+    #include "wx/x11/pen.h"
 #elif defined(__WXGTK20__)
-#include "wx/gtk/pen.h"
+    #include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk1/pen.h"
+    #include "wx/gtk1/pen.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/pen.h"
+    #include "wx/mgl/pen.h"
 #elif defined(__WXDFB__)
-#include "wx/dfb/pen.h"
+    #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
-#include "wx/osx/pen.h"
+    #include "wx/osx/pen.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/pen.h"
+    #include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)
-#include "wx/os2/pen.h"
+    #include "wx/os2/pen.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 1ca87cab93..23c142db7d 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -50,6 +50,11 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 9e77f0daa0..7e31ff6d1d 100644
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -64,6 +64,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;