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

Some more Motif work; included utils.h in fileconf.cpp (for wxGetHomeDir or something)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-22 21:15:56 +00:00
parent dcf40a56e7
commit 16c1f7f345
37 changed files with 2086 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/motif/dcmemory.cpp
View File

@@ -19,7 +19,7 @@
// wxMemoryDC
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
wxMemoryDC::wxMemoryDC(void)
{
@@ -37,9 +37,10 @@ wxMemoryDC::~wxMemoryDC(void)
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
{
m_selected = bitmap;
if (m_selected.Ok())
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
m_pixmap = m_bitmap.GetPixmap();
}
else
{
@@ -49,10 +50,10 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
void wxMemoryDC::GetSize( int *width, int *height ) const
{
if (m_selected.Ok())
if (m_bitmap.Ok())
{
if (width) (*width) = m_selected.GetWidth();
if (height) (*height) = m_selected.GetHeight();
if (width) (*width) = m_bitmap.GetWidth();
if (height) (*height) = m_bitmap.GetHeight();
}
else
{