projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added helper Is{Col,Row}Shown()
[wxWidgets.git]
/
include
/
wx
/
icon.h
diff --git
a/include/wx/icon.h
b/include/wx/icon.h
index f4f92e7451ecac755c3db0cabed0c238eaeb0c1f..5dca8e8b131fea8a0cff4bb956c775f15a57db88 100644
(file)
--- a/
include/wx/icon.h
+++ b/
include/wx/icon.h
@@
-14,28
+14,52
@@
#include "wx/iconloc.h"
#include "wx/iconloc.h"
+
+// a more readable way to tell
+#define wxICON_SCREEN_DEPTH (-1)
+
+
+// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE)
+// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile()
+// functions.
+
#if defined(__WXPALMOS__)
#if defined(__WXPALMOS__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
#elif defined(__WXMSW__)
#include "wx/generic/icon.h"
#elif defined(__WXMSW__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/motif/icon.h"
#elif defined(__WXGTK20__)
#include "wx/motif/icon.h"
#elif defined(__WXGTK20__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
#elif defined(__WXGTK__)
#include "wx/generic/icon.h"
#elif defined(__WXGTK__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
#elif defined(__WXX11__)
#include "wx/generic/icon.h"
#elif defined(__WXX11__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
#elif defined(__WXMGL__)
#include "wx/generic/icon.h"
#elif defined(__WXMGL__)
- #define wxICON_DEFAULT_
BITMAP_TYPE
wxBITMAP_TYPE_ICO_RESOURCE
+ #define wxICON_DEFAULT_
TYPE
wxBITMAP_TYPE_ICO_RESOURCE
#include "wx/generic/icon.h"
#elif defined(__WXDFB__)
#include "wx/generic/icon.h"
#elif defined(__WXDFB__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
#elif defined(__WXMAC__)
#include "wx/generic/icon.h"
#elif defined(__WXMAC__)
- #include "wx/mac/icon.h"
+#if wxOSX_USE_COCOA_OR_CARBON
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE
+ #include "wx/osx/icon.h"
+#else
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+ #include "wx/generic/icon.h"
+#endif
#elif defined(__WXCOCOA__)
#elif defined(__WXCOCOA__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE
#include "wx/cocoa/icon.h"
#elif defined(__WXPM__)
#include "wx/cocoa/icon.h"
#elif defined(__WXPM__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
#include "wx/os2/icon.h"
#endif
#include "wx/os2/icon.h"
#endif
@@
-45,7
+69,7
@@
#if wxUSE_VARIANT
#include "wx/variant.h"
#if wxUSE_VARIANT
#include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLL
EXPORT
)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLL
IMPEXP_CORE
)
#endif
#endif