changed/centralized window creation code to allow wxTLW work in wxUniv

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 2f1d51c90936f6af4bc85bb9fb0dc306c3a999f7..20d09c2ed4c541d9a72cb7782f49b8705fa64d74 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -21,15 +21,13 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 

-#include <gtk/gtk.h>  // only needed for wxGTKDash, should it go elsewhere..
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 

-#if GTK_CHECK_VERSION(1,2,7)
+#if defined(__WXGTK127__) || defined(__WXGTK20__)

 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;


@@ -47,8 +45,8 @@ public:
     wxPen( const wxPen& pen );
     ~wxPen();
     wxPen& operator = ( const wxPen& pen );
     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 );