projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It was not acceptable to call the class method from the static initializer
[wxWidgets.git]
/
include
/
wx
/
os2
/
icon.h
diff --git
a/include/wx/os2/icon.h
b/include/wx/os2/icon.h
index 383fd39e166d4bf16385d620beb6e36a6d67af78..3f138fb02a7bfdfef3d716b1779a2182bef69ba0 100644
(file)
--- a/
include/wx/os2/icon.h
+++ b/
include/wx/os2/icon.h
@@
-22,8
+22,8
@@
#define wxICON_IS_BITMAP 1
#endif
#define wxICON_IS_BITMAP 1
#endif
+#include "wx/bitmap.h"
#if wxICON_IS_BITMAP
#if wxICON_IS_BITMAP
- #include "wx/bitmap.h"
#define wxIconRefDataBase wxBitmapRefData
#define wxIconBase wxBitmap
#define wxIconRefDataBase wxBitmapRefData
#define wxIconBase wxBitmap
@@
-59,11
+59,18
@@
public:
,int nWidth
,int nHeight
);
,int nWidth
,int nHeight
);
+ inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
+ inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
wxIcon( const wxString& rName
,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
wxIcon( const wxString& rName
,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
+ wxIcon(const wxIconLocation& loc)
+ {
+ LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+ }
+
~wxIcon();
bool LoadFile( const wxString& rName
~wxIcon();
bool LoadFile( const wxString& rName
@@
-83,14
+90,21
@@
public:
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
+ inline bool IsXpm(void) const { return m_bIsXpm; };
+ inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
+ void CopyFromBitmap(const wxBitmap& rBmp);
protected:
virtual wxGDIImageRefData* CreateData() const
{
return new wxIconRefData;
}
protected:
virtual wxGDIImageRefData* CreateData() const
{
return new wxIconRefData;
}
+ void CreateIconFromXpm(const char **ppData);
private:
private:
+ bool m_bIsXpm;
+ wxBitmap m_vXpmSrc;
+
DECLARE_DYNAMIC_CLASS(wxIcon)
};
DECLARE_DYNAMIC_CLASS(wxIcon)
};