projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxTreeListCtrl still uses the wxTR_TWIST_BUTTONS style
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
bitmap.h
diff --git
a/include/wx/cocoa/bitmap.h
b/include/wx/cocoa/bitmap.h
index 622aab943e37dc0a56e3f1a9af0464dcb3f2dcaa..47dc498d965ea7d2aae0a2698e5b5b42d2c4cbf7 100644
(file)
--- a/
include/wx/cocoa/bitmap.h
+++ b/
include/wx/cocoa/bitmap.h
@@
-86,6
+86,9
@@
public:
// Convert from wxImage:
wxBitmap(const wxImage& image, int depth = -1)
{ CreateFromImage(image, depth); }
// Convert from wxImage:
wxBitmap(const wxImage& image, int depth = -1)
{ CreateFromImage(image, depth); }
+ // Convert from wxIcon
+ wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
+
// destructor
~wxBitmap();
// destructor
~wxBitmap();
@@
-148,6
+151,7
@@
public:
// wxCocoa
WX_NSBitmapImageRep GetNSBitmapImageRep();
void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep);
// wxCocoa
WX_NSBitmapImageRep GetNSBitmapImageRep();
void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep);
+ WX_NSImage GetNSImage(bool useMask) const;
static void InitStandardHandlers() { }
static void CleanUpHandlers() { }
static void InitStandardHandlers() { }
static void CleanUpHandlers() { }