rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

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

diff --git a/include/wx/pen.h b/include/wx/pen.h
index b94486f364297717e880d30f7b1191e2a905ce93..479a9668ea0bb7edd2ed4bba52d35859128da80d 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -62,7 +62,7 @@ enum wxPenCap
 };
 
 
 };
 
 

-class WXDLLEXPORT wxPenBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject

 {
 public:
     virtual ~wxPenBase() { }
 {
 public:
     virtual ~wxPenBase() { }


@@ -77,40 +77,35 @@ public:
     virtual void SetJoin(wxPenJoin join) = 0;
     virtual void SetCap(wxPenCap cap) = 0;
 
     virtual void SetJoin(wxPenJoin join) = 0;
     virtual void SetCap(wxPenCap cap) = 0;
 

-    virtual wxColour& GetColour() const = 0;
+    virtual wxColour GetColour() const = 0;

     virtual wxBitmap *GetStipple() const = 0;
     virtual wxPenStyle GetStyle() const = 0;
     virtual wxPenJoin GetJoin() const = 0;
     virtual wxPenCap GetCap() const = 0;
     virtual int GetWidth() const = 0;
     virtual int GetDashes(wxDash **ptr) const = 0;
     virtual wxBitmap *GetStipple() const = 0;
     virtual wxPenStyle GetStyle() const = 0;
     virtual wxPenJoin GetJoin() const = 0;
     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__)
 };
 
 #if defined(__WXPALMOS__)

-#include "wx/palmos/pen.h"
+    #include "wx/palmos/pen.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-#include "wx/msw/pen.h"
+    #include "wx/msw/pen.h"

 #elif defined(__WXMOTIF__) || defined(__WXX11__)
 #elif defined(__WXMOTIF__) || defined(__WXX11__)

-#include "wx/x11/pen.h"
+    #include "wx/x11/pen.h"

 #elif defined(__WXGTK20__)
 #elif defined(__WXGTK20__)

-#include "wx/gtk/pen.h"
+    #include "wx/gtk/pen.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk1/pen.h"
+    #include "wx/gtk1/pen.h"

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-#include "wx/mgl/pen.h"
+    #include "wx/mgl/pen.h"

 #elif defined(__WXDFB__)
 #elif defined(__WXDFB__)

-#include "wx/dfb/pen.h"
+    #include "wx/dfb/pen.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/pen.h"
+    #include "wx/osx/pen.h"

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-#include "wx/cocoa/pen.h"
+    #include "wx/cocoa/pen.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/pen.h"
+    #include "wx/os2/pen.h"

 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase


@@ -130,7 +125,7 @@ public:
 #endif
 };
 
 #endif
 };
 

-extern WXDLLEXPORT_DATA(wxPenList*)   wxThePenList;
+extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;

 
 // provide comparison operators to allow code such as
 //
 
 // provide comparison operators to allow code such as
 //


@@ -142,7 +137,7 @@ extern WXDLLEXPORT_DATA(wxPenList*)   wxThePenList;
 
 inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
 {
 
 inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
 {

-    return wx_static_cast(int, s) == wx_static_cast(int, t);
+    return static_cast<int>(s) == static_cast<int>(t);

 }
 
 inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
 }
 
 inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)