declare future-deprecated SetStyle(int) in wxPen/Brush and not wxPen/BrushBase as...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/brush.h b/include/wx/brush.h
index fa0103cf4d6322be21682843d0bd61e5db5ede3c..7ad451927c18f42be4d60a753da8221dbf252c58 100644 (file)
--- 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 965e35f109503062a08876aa2eeac7b6538ab292..47970da8cc228faa29df29cf4ebf0ac01f8d2146 100644 (file)
--- 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 73f7c568f191b9bcaa4cbc5dd9625ebb457484a2..279f3d38949b5d27434e0b0bedb9a70e41726119 100644 (file)
--- 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 c2360bef88a6a8d05cf577e7695d58b2a1101d10..47799b7e8452796781f9cde69b2e7fdbf2c8bf4f 100644 (file)
--- 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 27fe9a9be6d498814b67eac909f7b6971025d02f..00e1f783befcfc2fcef9eedf54589467ed50a961 100644 (file)
--- 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 5c3e1d7ab693dc7c91456d82f792a31529a08a46..848fdf8cc5c88b3256ea0b739dd68e471afbbf21 100644 (file)
--- 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 2af7d460487e6bd46de499ee979727993b520b28..4f1a3cf7ed17260fb766cb3f8734cc563c671002 100644 (file)
--- 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 c7ea67babecba5ce1c9a3fa3495cb06b4793cb14..7a44ae2a335dff62b200b501056a396fb67d6e1f 100644 (file)
--- 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 887a77951cbd923b79c87b92f51bcde1eeb6a0ba..97fea928a31962b3eeb0d98a8336d140e7296ebd 100644 (file)
--- 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 6dd2b763a64f93e0da99fe2bea25eec72386b819..ec06a3821ea8850b72af616db9554f3bdffc8916 100644 (file)
--- 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 cd7188c4650a20bc1b62cffd165e046f26f470b7..6454bee1b251bf2ad75396fa9d9cce4d3d2c7124 100644 (file)
--- 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 3d1c7e3ae15f53d14dda634f03acb08adea968a7..d4ddc8d813ee591276331d3683c7139e2ea2e3d6 100644 (file)
--- 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 0cff049e87e7529eef2d5f8277eb33976adc0b93..ab4deee8b6a2e704a4d9654862f5b5ae866de766 100644 (file)
--- 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 c3dcfe85a3126bd8c1a469d752fc700b409ae799..c13dcf00fb70e70103b615790a0ad3bf4fbfd16f 100644 (file)
--- 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 f05f6382f6cfbd17dfde32d069e9d45dbe7d056a..5907125fc8455ef4805f435aaf705ce63fb77d18 100644 (file)
--- 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 0d4d1c558630d50ee4101c96e070274b0c81818e..68778697e25f4b70972b2f63729b81b59bf8b83f 100644 (file)
--- 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 3807aa523ea6781d59f947e01ba863110e962f24..a5ae6095e3b2736921af0bae61d90fd05c7da2e1 100644 (file)
--- 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 ba55d5bad7de96364a0e4235c890c3636adc8cba..3625ad9fd592b8106bc37f68316dea93163ba2e1 100644 (file)
--- 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 aa8e6443141dae19f78f44e4278218111e35bfb1..4dd60758b91b798a62ffc8197e96f0a9a226cba7 100644 (file)
--- 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 53069c51e5d05d10f352dc47af0be9abf563f6fb..ec705d9e40cbcb93036d424f3201e2d828354289 100644 (file)
--- 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 1ca87cab93d9ecdcaf255fb322180fe550ed9b06..23c142db7d099a0e57bbc08076f0acb82442e7d6 100644 (file)
--- 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 9e77f0daa078ec13c8afcb685ef46274e27517ac..7e31ff6d1da0c3ce8d9a2f724ce2354bb70299e1 100644 (file)
--- 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;