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

Use the wxBitmap implementation from wxX11

Browse Source 
in wxMotif; solves various bugs related to wxMask
handling (and effectively adds a lot of wxMask
functionality previously missing).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-04-09 16:44:27 +00:00
parent 507db85d59
commit aae0472bf3
16 changed files with 80 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/motif/bmpbuttn.cpp
View File

@@ -177,7 +177,7 @@ void wxBitmapButton::DoSetBitmap()
m_bmpNormal = newBitmap;
m_bitmapCache.SetBitmap( m_bmpNormal );
pixmap = (Pixmap) m_bmpNormal.GetPixmap();
pixmap = (Pixmap) m_bmpNormal.GetDrawable();
}
else
{
@@ -201,7 +201,7 @@ void wxBitmapButton::DoSetBitmap()
wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
m_bmpDisabled = newBitmap;
insensPixmap = (Pixmap) m_bmpDisabled.GetPixmap();
insensPixmap = (Pixmap) m_bmpDisabled.GetDrawable();
}
else
insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
@@ -226,7 +226,7 @@ void wxBitmapButton::DoSetBitmap()
wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
m_bmpSelected = newBitmap;
armPixmap = (Pixmap) m_bmpSelected.GetPixmap();
armPixmap = (Pixmap) m_bmpSelected.GetDrawable();
}
else
armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);