projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't include pbt.h from wxMSW code unnecessarily.
[wxWidgets.git]
/
src
/
os2
/
dcmemory.cpp
diff --git
a/src/os2/dcmemory.cpp
b/src/os2/dcmemory.cpp
index b42e3844419cdd6a00ec961bbd76c973ff1e0048..64acc9f90dadbba6274f1228b2bfa35fcb02ec32 100644
(file)
--- a/
src/os2/dcmemory.cpp
+++ b/
src/os2/dcmemory.cpp
@@
-13,6
+13,7
@@
#include "wx/wxprec.h"
#include "wx/dcmemory.h"
#include "wx/wxprec.h"
#include "wx/dcmemory.h"
+#include "wx/os2/dcmemory.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
@@
-22,27
+23,37
@@
#include "wx/os2/private.h"
#include "wx/os2/private.h"
-IMPLEMENT_
DYNAMIC_CLASS(wxMemoryDC, wxDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl
)
/////////////////////////////////////////////////////////////////////////////
// Memory DC
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Memory DC
/////////////////////////////////////////////////////////////////////////////
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+ : wxPMDCImpl( owner )
{
CreateCompatible(NULL);
Init();
{
CreateCompatible(NULL);
Init();
-}
// end of wxMemoryDC::wxMemoryDC
+}
-wxMemoryDC::wxMemoryDC(
- wxDC* pOldDC
-)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+ : wxPMDCImpl( owner )
+{
+ CreateCompatible(NULL);
+ Init();
+ DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
+ : wxPMDCImpl( owner )
{
{
+ wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
+
CreateCompatible(pOldDC);
Init();
} // end of wxMemoryDC::wxMemoryDC
CreateCompatible(pOldDC);
Init();
} // end of wxMemoryDC::wxMemoryDC
-void wxMemoryDC::Init()
+void wxMemoryDC
Impl
::Init()
{
if (m_ok)
{
{
if (m_ok)
{
@@
-56,7
+67,7
@@
void wxMemoryDC::Init()
memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
} // end of wxMemoryDC::Init
memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
} // end of wxMemoryDC::Init
-bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
+bool wxMemoryDC
Impl
::CreateCompatible( wxDC* WXUNUSED(pDC) )
{
HDC hDC;
HPS hPS;
{
HDC hDC;
HPS hPS;
@@
-118,7
+129,7
@@
bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
return m_ok;
} // end of wxMemoryDC::CreateCompatible
return m_ok;
} // end of wxMemoryDC::CreateCompatible
-void wxMemoryDC
::SelectObj
ect(
+void wxMemoryDC
Impl::DoSel
ect(
const wxBitmap& rBitmap
)
{
const wxBitmap& rBitmap
)
{
@@
-128,7
+139,7
@@
void wxMemoryDC::SelectObject(
if (m_hOldBitmap)
{
::GpiSetBitmap(m_hPS, NULLHANDLE);
if (m_hOldBitmap)
{
::GpiSetBitmap(m_hPS, NULLHANDLE);
- if (m_vSelectedBitmap.Ok())
+ if (m_vSelectedBitmap.
Is
Ok())
{
m_vSelectedBitmap.SetSelectedInto(NULL);
m_vSelectedBitmap = wxNullBitmap;
{
m_vSelectedBitmap.SetSelectedInto(NULL);
m_vSelectedBitmap = wxNullBitmap;
@@
-139,7
+150,7
@@
void wxMemoryDC::SelectObject(
// Check for whether the bitmap is already selected into a device context
//
wxCHECK_RET( !rBitmap.GetSelectedInto() ||
// Check for whether the bitmap is already selected into a device context
//
wxCHECK_RET( !rBitmap.GetSelectedInto() ||
- (rBitmap.GetSelectedInto() ==
this
),
+ (rBitmap.GetSelectedInto() ==
GetOwner()
),
wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
WXHBITMAP hBmp = rBitmap.GetHBITMAP();
wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
WXHBITMAP hBmp = rBitmap.GetHBITMAP();
@@
-165,6
+176,7
@@
void wxMemoryDC::SelectObject(
);
m_vSelectedBitmap.SetSelectedInto(NULL);
}
);
m_vSelectedBitmap.SetSelectedInto(NULL);
}
+
m_vSelectedBitmap = rBitmap;
m_vSelectedBitmap = rBitmap;
@@
-174,7
+186,7
@@
void wxMemoryDC::SelectObject(
m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
return;
}
m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
return;
}
- m_vSelectedBitmap.SetSelectedInto(
this
);
+ m_vSelectedBitmap.SetSelectedInto(
GetOwner()
);
m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
if (m_hOldBitmap == HBM_ERROR)
m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
if (m_hOldBitmap == HBM_ERROR)
@@
-184,12
+196,12
@@
void wxMemoryDC::SelectObject(
}
} // end of wxMemoryDC::SelectObject
}
} // end of wxMemoryDC::SelectObject
-void wxMemoryDC::DoGetSize(
+void wxMemoryDC
Impl
::DoGetSize(
int* pWidth
, int* pHeight
) const
{
int* pWidth
, int* pHeight
) const
{
- if (!m_vSelectedBitmap.Ok())
+ if (!m_vSelectedBitmap.
Is
Ok())
{
*pWidth = 0;
*pHeight = 0;
{
*pWidth = 0;
*pHeight = 0;