X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5bad6049fe4b1a487d2e3f66a72678bc0933fcd..67393addd823ea1a9b653a93c8554e7fd013ecfa:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 7accd3a796..18dce6cbfb 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -157,6 +157,9 @@ enum wxStockCursor #elif defined(__WXMGL__) // Initialize from an included XPM #define wxICON(X) wxIcon( (const char**) X##_xpm ) +#elif defined(__WXDFB__) + // Initialize from an included XPM + #define wxICON(X) wxIcon( (const char**) X##_xpm ) #elif defined(__WXGTK__) // Initialize from an included XPM #define wxICON(X) wxIcon( (const char**) X##_xpm ) @@ -185,6 +188,7 @@ enum wxStockCursor defined(__WXX11__) || \ defined(__WXMAC__) || \ defined(__WXMGL__) || \ + defined(__WXDFB__) || \ defined(__WXCOCOA__) // Initialize from an included XPM #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) @@ -483,7 +487,7 @@ public: }; #if WXWIN_COMPATIBILITY_2_6 -inline bool wxRect::Inside(int x, int y) const { return Contains(x, y); } +inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); } inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); } inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); } #endif // WXWIN_COMPATIBILITY_2_6