allow loading wxAnimationCtrl contents from stream (patch 1962344)

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index 974edb4872fbea4f8eca1e746779376fa49ce8c6..cd7188c4650a20bc1b62cffd165e046f26f470b7 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_PEN_H__
 #define __WX_PEN_H__
 
-#ifdef __GNUG__
-#pragma interface "pen.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -25,55 +20,54 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 {
 public:
     wxPen() {}
-    wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
+    wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
+
     wxPen(const wxBitmap& stipple, int width);
-    wxPen(const wxPen& pen);
-    ~wxPen() {}
-    wxPen& operator = (const wxPen& pen);
+    virtual ~wxPen() {}
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
 
     void SetColour(const wxColour &colour);
-    void SetColour(int red, int green, int blue);
-    void SetCap(int capStyle);
-    void SetJoin(int joinStyle);
-    void SetStyle(int style);
+    void SetColour(unsigned char red, unsigned char green, unsigned char blue);
+    void SetCap(wxPenCap capStyle);
+    void SetJoin(wxPenJoin joinStyle);
+    void SetStyle(wxPenStyle style);
     void SetWidth(int width);
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
-    
-    wxColour &GetColour() const;
-    int GetCap() const;
-    int GetJoin() const;
-    int GetStyle() const;
+
+    wxColour GetColour() const;
+    wxPenCap GetCap() const;
+    wxPenJoin GetJoin() const;
+    wxPenStyle GetStyle() const;
     int GetWidth() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
-    
-    bool Ok() const;
 
     // implementation:
     void* GetPixPattern() const;
 
 protected:
-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 };