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

Bitmap and icon updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-01-29 05:46:06 +00:00
parent a559d70856
commit 8bb6da4ae6
5 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,12 +54,12 @@ public:
// ------------
wxDC* m_pSelectedInto;
HPS m_hPresentationSpace;
LONG m_lId;
// optional mask for transparent drawing
//
// Optional mask for transparent drawing
//
wxMask* m_pBitmapMask;
};
}; // end of CLASS wxBitmapRefData
// ----------------------------------------------------------------------------
// wxBitmap: a mono or colour bitmap
@@ -83,9 +83,8 @@ public:
);
// Initialize with XPM data
wxBitmap( char** ppData
,wxControl* pAnItem = NULL
);
wxBitmap(const char** ppData);
wxBitmap(char** ppData);
// Load a file or resource
wxBitmap( const wxString& rName
@@ -214,8 +213,8 @@ public:
// An OS/2 version that probably doesn't do anything like the msw version
wxBitmap GetBitmapForDC(wxDC& rDc) const;
inline LONG GetId() const
{ return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
// inline LONG GetId() const
// { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
protected:
@@ -281,10 +280,7 @@ public:
protected:
WXHBITMAP m_hMaskBitmap;
DECLARE_DYNAMIC_CLASS(wxMask)
private:
HDC m_hDc;
HPS m_hPs;
}; // end of wxMask
}; // end of CLASS wxMask
// ----------------------------------------------------------------------------
// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
@@ -348,7 +344,7 @@ public:
);
private:
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
}; // end of wxBitmapHandler
}; // end of CLASS wxBitmapHandler
#endif
// _WX_BITMAP_H_