Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new ctor for wxBitmap using wxCursor for wxQT (similar to wxGTK)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart
2015-01-04 03:51:57 +00:00
parent 2e21cc2607
commit 6022671ee5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/qt/bitmap.h
View File

@@ -11,6 +11,7 @@
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
class WXDLLIMPEXP_FWD_CORE wxImage; class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class QImage; class QImage;
class QPixmap; class QPixmap;
@@ -29,8 +30,9 @@ public:
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
// Convert from wxIcon // Convert from wxIcon / wxCursor
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
wxEXPLICIT wxBitmap(const wxCursor& cursor);
static void InitStandardHandlers(); static void InitStandardHandlers();