fix some warnings from GCC -Wextra

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 8be99f28b92bee723502d4a363f9f1edfc7214a0..2af7d460487e6bd46de499ee979727993b520b28 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -7,20 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKPENH__
-#define __GTKPENH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen;
+#ifndef _WX_GTK_PEN_H_
+#define _WX_GTK_PEN_H_

 
 typedef    gint8 wxGTKDash;
 
 
 typedef    gint8 wxGTKDash;
 


@@ -28,42 +16,45 @@ typedef    gint8 wxGTKDash;
 // wxPen
 //-----------------------------------------------------------------------------
 
 // wxPen
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxPen() { }
 
 {
 public:
     wxPen() { }
 

-    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
-    ~wxPen();
+    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

 
 

-    bool Ok() const { return m_refData != NULL; }
+    virtual ~wxPen();

 
 

-    bool operator == ( const wxPen& pen ) const;
-    bool operator != (const wxPen& pen) const { return !(*this == pen); }
+    bool operator==(const wxPen& pen) const;
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }

 
     void SetColour( const wxColour &colour );
     void SetColour( unsigned char red, unsigned char green, unsigned char blue );
 
     void SetColour( const wxColour &colour );
     void SetColour( unsigned char red, unsigned char green, unsigned char blue );

-    void SetCap( int capStyle );
-    void SetJoin( int joinStyle );
-    void SetStyle( int style );
+    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 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;
     int GetWidth() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;

+    wxBitmap *GetStipple() const;

 
 protected:
 
 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;

 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 

-#endif // __GTKPENH__
+#endif // _WX_GTK_PEN_H_