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

added AutoHRGN class; corrected GetHbrush[Of]() macros

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-04-02 01:15:47 +00:00
parent cf000528d0
commit a27cbf44fc
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/wx/msw/private.h
View File

@@ -415,25 +415,38 @@ private:
DECLARE_NO_COPY_CLASS(SelectInHDC) DECLARE_NO_COPY_CLASS(SelectInHDC)
}; };
// a class which cleans up any GDI object
class AutoGDIObject
{
protected:
AutoGDIObject(HGDIOBJ gdiobj) : m_gdiobj(gdiobj) { }
~AutoGDIObject() { if ( m_gdiobj ) ::DeleteObject(m_gdiobj); }
HGDIOBJ GetObject() const { return m_gdiobj; }
private:
HGDIOBJ m_gdiobj;
};
// a class for temporary bitmaps // a class for temporary bitmaps
class CompatibleBitmap class CompatibleBitmap : private AutoGDIObject
{ {
public: public:
CompatibleBitmap(HDC hdc, int w, int h) CompatibleBitmap(HDC hdc, int w, int h)
: AutoGDIObject(::CreateCompatibleBitmap(hdc, w, h))
{ {
m_hbmp = ::CreateCompatibleBitmap(hdc, w, h);
} }
~CompatibleBitmap() operator HBITMAP() const { return (HBITMAP)GetObject(); }
{ };
if ( m_hbmp )
::DeleteObject(m_hbmp);
}
operator HBITMAP() const { return m_hbmp; } // class automatically destroys the region object
class AutoHRGN : private AutoGDIObject
{
public:
AutoHRGN(HRGN hrgn) : AutoGDIObject(hrgn) { }
private: operator HRGN() const { return (HRGN)GetObject(); }
HBITMAP m_hbmp;
}; };
// when working with global pointers (which is unfortunately still necessary // when working with global pointers (which is unfortunately still necessary
@@ -557,8 +570,8 @@ private:
#define GetHaccel() ((HACCEL)GetHACCEL()) #define GetHaccel() ((HACCEL)GetHACCEL())
#define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL())) #define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL()))
#define GetHbrush() ((HPEN)GetResourceHandle()) #define GetHbrush() ((HBRUSH)GetResourceHandle())
#define GetHbrushOf(brush) ((HPEN)(brush).GetResourceHandle()) #define GetHbrushOf(brush) ((HBRUSH)(brush).GetResourceHandle())
#define GetHmenu() ((HMENU)GetHMenu()) #define GetHmenu() ((HMENU)GetHMenu())
#define GetHmenuOf(menu) ((HMENU)menu->GetHMenu()) #define GetHmenuOf(menu) ((HMENU)menu->GetHMenu())
@@ -740,5 +753,4 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data)
#endif // wxUSE_GUI #endif // wxUSE_GUI
#endif #endif // _WX_PRIVATE_H_
// _WX_PRIVATE_H_