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

OS/2 Image processing updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-05-06 21:47:16 +00:00
parent ab249a4dcb
commit 79c093419e
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,6 +216,8 @@ public:
inline wxDC* GetSelectedInto() const inline wxDC* GetSelectedInto() const
{ return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); } { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
inline bool IsMono(void) const { return m_bIsMono; }
// An OS/2 version that probably doesn't do anything like the msw version // An OS/2 version that probably doesn't do anything like the msw version
wxBitmap GetBitmapForDC(wxDC& rDc) const; wxBitmap GetBitmapForDC(wxDC& rDc) const;
@@ -237,6 +239,8 @@ protected:
private: private:
bool CopyFromIconOrCursor(const wxGDIImage& rIcon); bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
bool m_bIsMono;
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)
}; // end of CLASS wxBitmap }; // end of CLASS wxBitmap

7
include/wx/os2/icon.h
View File

@@ -22,8 +22,8 @@
#define wxICON_IS_BITMAP 1 #define wxICON_IS_BITMAP 1
#endif #endif
#include "wx/bitmap.h"
#if wxICON_IS_BITMAP #if wxICON_IS_BITMAP
#include "wx/bitmap.h"
#define wxIconRefDataBase wxBitmapRefData #define wxIconRefDataBase wxBitmapRefData
#define wxIconBase wxBitmap #define wxIconBase wxBitmap
@@ -85,6 +85,8 @@ public:
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); } inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } 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); void CopyFromBitmap(const wxBitmap& rBmp);
protected: protected:
@@ -95,6 +97,9 @@ protected:
void CreateIconFromXpm(const char **ppData); void CreateIconFromXpm(const char **ppData);
private: private:
bool m_bIsXpm;
wxBitmap m_vXpmSrc;
DECLARE_DYNAMIC_CLASS(wxIcon) DECLARE_DYNAMIC_CLASS(wxIcon)
}; };