A couple more 'int' to UWORD conversions

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index cbe0cd1ae2ec4fd4f9f36e8190f09e20a83a4bd7..20d09c2ed4c541d9a72cb7782f49b8705fa64d74 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -27,7 +27,11 @@
 
 class wxPen;
 
 
 class wxPen;
 

-typedef    char wxDash;
+#if defined(__WXGTK127__) || defined(__WXGTK20__)
+typedef    gint8 wxGTKDash;
+#else
+typedef    gchar wxGTKDash;
+#endif

 
 //-----------------------------------------------------------------------------
 // wxPen
 
 //-----------------------------------------------------------------------------
 // wxPen


@@ -35,17 +39,14 @@ typedef    char wxDash;
 
 class wxPen: public wxGDIObject
 {
 
 class wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
-
+public:

     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );
     ~wxPen();
     wxPen& operator = ( const wxPen& pen );
     wxPen();
     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxPen& pen );
     ~wxPen();
     wxPen& operator = ( const wxPen& pen );

-    bool operator == ( const wxPen& pen );
-    bool operator != ( const wxPen& pen );
+    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 SetColour( const wxColour &colour );
     void SetColour( int red, int green, int blue );


@@ -68,7 +69,8 @@ class wxPen: public wxGDIObject
 
     void Unshare();
 
 
     void Unshare();
 

-    // no data :-)
+private:    
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 #endif // __GTKPENH__
 };
 
 #endif // __GTKPENH__