More of the same.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -217,6 +217,8 @@ public:
|
|||||||
{ return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
|
{ return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
|
||||||
|
|
||||||
inline bool IsMono(void) const { return m_bIsMono; }
|
inline bool IsMono(void) const { return m_bIsMono; }
|
||||||
|
inline bool Flip(void) const { return m_bFlip; }
|
||||||
|
|
||||||
|
|
||||||
// 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;
|
||||||
@@ -240,7 +242,7 @@ private:
|
|||||||
bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
|
bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
|
||||||
|
|
||||||
bool m_bIsMono;
|
bool m_bIsMono;
|
||||||
|
bool m_bFlip;
|
||||||
DECLARE_DYNAMIC_CLASS(wxBitmap)
|
DECLARE_DYNAMIC_CLASS(wxBitmap)
|
||||||
}; // end of CLASS wxBitmap
|
}; // end of CLASS wxBitmap
|
||||||
|
|
||||||
|
@@ -526,7 +526,7 @@ bool wxBitmap::CreateFromImage (
|
|||||||
{
|
{
|
||||||
wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
|
wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
|
||||||
m_refData = new wxBitmapRefData();
|
m_refData = new wxBitmapRefData();
|
||||||
|
m_bFlip = TRUE;
|
||||||
|
|
||||||
int nSizeLimit = 1024 * 768 * 3;
|
int nSizeLimit = 1024 * 768 * 3;
|
||||||
int nWidth = rImage.GetWidth();
|
int nWidth = rImage.GetWidth();
|
||||||
|
Reference in New Issue
Block a user