X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76ed8f8d9c2b826d77d70b41c046decbde23da35..358d140ac93338920e263d00f05d142a6051ce67:/include/wx/gdicmn.h?ds=sidebyside

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 9ea245de1c..111b6ba1d8 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -69,6 +69,7 @@ public:
   inline wxSize(long xx, long yy) { x = xx; y = yy; }
   inline wxSize(const wxSize& sz) { x = sz.x; y = sz.y; }
   inline void operator = (const wxSize& sz) { x = sz.x; y = sz.y; }
+  inline bool operator == (const wxSize& sz) const { return (x == sz.x && y == sz.y); }
   inline wxSize operator + (const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
   inline wxSize operator - (const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
   inline void Set(long xx, long yy) { x = xx; y = yy; }
@@ -88,6 +89,7 @@ class WXDLLEXPORT wxRealPoint
   inline wxRealPoint operator - (const wxRealPoint& pt) { return wxRealPoint(x - pt.x, y - pt.y); }
 
   inline void operator = (const wxRealPoint& pt) { x = pt.x; y = pt.y; }
+  inline bool operator == (const wxRealPoint& pt) const { return (x == pt.x && y == pt.y); }
 };
 
 class WXDLLEXPORT wxPoint
@@ -106,6 +108,7 @@ class WXDLLEXPORT wxPoint
   wxPoint(const wxPoint& pt) { x = pt.x; y = pt.y; };
 
   inline void operator = (const wxPoint& pt) { x = pt.x; y = pt.y; }
+  inline bool operator == (const wxPoint& pt) const { return (x == pt.x && y == pt.y); }
   inline wxPoint operator + (const wxPoint& pt) { return wxPoint(x + pt.x, y + pt.y); }
   inline wxPoint operator - (const wxPoint& pt) { return wxPoint(x - pt.x, y - pt.y); }
 };
@@ -179,6 +182,8 @@ class WXDLLEXPORT wxRegion;
 #define wxBITMAP_TYPE_GIF_RESOURCE      14
 #define wxBITMAP_TYPE_PNG               15
 #define wxBITMAP_TYPE_PNG_RESOURCE      16
+#define wxBITMAP_TYPE_JPEG              17
+#define wxBITMAP_TYPE_JPEG_RESOURCE     18
 #define wxBITMAP_TYPE_ANY               50
 
 #define wxBITMAP_TYPE_RESOURCE wxBITMAP_TYPE_BMP_RESOURCE
@@ -214,7 +219,7 @@ class WXDLLEXPORT wxBrushList: public wxList
   wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 class WXDLLEXPORT wxFontList: public wxList
 {
@@ -303,9 +308,6 @@ WXDLLEXPORT_DATA(extern wxBrush)  		wxNullBrush;
 WXDLLEXPORT_DATA(extern wxPalette) 		wxNullPalette;
 WXDLLEXPORT_DATA(extern wxFont)   		wxNullFont;
 WXDLLEXPORT_DATA(extern wxColour) 		wxNullColour;
-#ifdef __WXGTK__
-WXDLLEXPORT_DATA(extern wxRegion) 		wxNullRegion;
-#endif
 
 // Stock cursors types
 WXDLLEXPORT_DATA(extern wxCursor*)		wxSTANDARD_CURSOR;