projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cvs to svn
[wxWidgets.git]
/
src
/
msw
/
dcmemory.cpp
diff --git
a/src/msw/dcmemory.cpp
b/src/msw/dcmemory.cpp
index ea4c0c90e60e3099b5e47431320f5a7e5796b8a2..5565670444c6e91eeed472bd8bb43d5faa3ef5f3 100644
(file)
--- a/
src/msw/dcmemory.cpp
+++ b/
src/msw/dcmemory.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.cpp
+// Name:
src/msw/
dcmemory.cpp
// Purpose: wxMemoryDC class
// Author: Julian Smart
// Modified by:
// Purpose: wxMemoryDC class
// Author: Julian Smart
// Modified by:
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dcmemory.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-28,6
+24,8
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#include "wx/dcmemory.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/log.h"
@@
-35,8
+33,6
@@
#include "wx/msw/private.h"
#include "wx/msw/private.h"
-#include "wx/dcmemory.h"
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
@@
-51,23
+47,12
@@
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
// wxMemoryDC
// ----------------------------------------------------------------------------
// wxMemoryDC
// ----------------------------------------------------------------------------
-wxMemoryDC::wxMemoryDC()
-{
- CreateCompatible(NULL);
-
- Init();
-}
-
wxMemoryDC::wxMemoryDC(wxDC *dc)
{
wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
wxMemoryDC::wxMemoryDC(wxDC *dc)
{
wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
- dc->BeginDrawing();
-
CreateCompatible(dc);
CreateCompatible(dc);
- dc->EndDrawing();
-
Init();
}
Init();
}
@@
-89,14
+74,14
@@
bool wxMemoryDC::CreateCompatible(wxDC *dc)
m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL);
// as we created the DC, we must delete it in the dtor
m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL);
// as we created the DC, we must delete it in the dtor
- m_bOwnsDC =
TRUE
;
+ m_bOwnsDC =
true
;
m_ok = m_hDC != 0;
return m_ok;
}
m_ok = m_hDC != 0;
return m_ok;
}
-void wxMemoryDC::
SelectObject(
const wxBitmap& bitmap)
+void wxMemoryDC::
DoSelect(
const wxBitmap& bitmap)
{
// select old bitmap out of the device context
if ( m_oldBitmap )
{
// select old bitmap out of the device context
if ( m_oldBitmap )
@@
-207,4
+192,3
@@
void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he
wxDC::DoDrawRectangle(x, y, width, height);
}
}
wxDC::DoDrawRectangle(x, y, width, height);
}
}
-