projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1577388] - fix for scaling in wxImage.
[wxWidgets.git]
/
src
/
cocoa
/
icon.mm
diff --git
a/src/cocoa/icon.mm
b/src/cocoa/icon.mm
index d385c6d9c7741458c1d32bc927c5956d26132eed..09924c8cb7cc16bc3518d843310101e8a29fcb2e 100644
(file)
--- a/
src/cocoa/icon.mm
+++ b/
src/cocoa/icon.mm
@@
-14,10
+14,9
@@
#include "wx/icon.h"
#ifndef WX_PRECOMP
#include "wx/icon.h"
#ifndef WX_PRECOMP
+ #include "wx/bitmap.h"
#endif //WX_PRECOMP
#endif //WX_PRECOMP
-#include "wx/bitmap.h"
-
#include "wx/cocoa/autorelease.h"
#import <AppKit/NSImage.h>
#include "wx/cocoa/autorelease.h"
#import <AppKit/NSImage.h>
@@
-135,7
+134,7
@@
void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
M_ICONDATA->m_quality = 0;
}
M_ICONDATA->m_quality = 0;
}
-bool wxIcon::Ok() const
+bool wxIcon::
Is
Ok() const
{
return m_refData && M_ICONDATA->m_ok;
}
{
return m_refData && M_ICONDATA->m_ok;
}