X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3af706cc3164bacc24899e0fc827c28e7ea812b6..5f4d18209157a5ce671f101ec25734ac075a79f9:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index a3ff41b1c4..acd374d4c3 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -37,6 +37,7 @@ class WXDLLIMPEXP_CORE wxPalette; class WXDLLIMPEXP_CORE wxPen; class WXDLLIMPEXP_CORE wxRegion; class WXDLLIMPEXP_BASE wxString; +class WXDLLIMPEXP_CORE wxIconBundle; // --------------------------------------------------------------------------- // constants @@ -157,6 +158,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 +189,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 ) @@ -239,8 +244,8 @@ public: void DecBy(int d) { DecBy(d, d); } - void Scale(float xscale, float yscale) - { x = (int)(x*xscale); y = (int)(y*yscale); } + wxSize& Scale(float xscale, float yscale) + { x = (int)(x*xscale); y = (int)(y*yscale); return *this; } // accessors void Set(int xx, int yy) { x = xx; y = yy; } @@ -483,7 +488,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 @@ -708,9 +713,10 @@ extern WXDLLEXPORT_DATA(wxIcon) wxNullIcon; extern WXDLLEXPORT_DATA(wxCursor) wxNullCursor; extern WXDLLEXPORT_DATA(wxPen) wxNullPen; extern WXDLLEXPORT_DATA(wxBrush) wxNullBrush; -extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette; +extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette; extern WXDLLEXPORT_DATA(wxFont) wxNullFont; extern WXDLLEXPORT_DATA(wxColour) wxNullColour; +extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle; extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase;