projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFlagsProperty now automatically relays wxBOOL_USE_CHECKBOX and wxBOOL_USE_DOUBLE_CL...
[wxWidgets.git]
/
src
/
dfb
/
dcclient.cpp
diff --git
a/src/dfb/dcclient.cpp
b/src/dfb/dcclient.cpp
index 6514a4f599674a13e5e061d6cf36bca05c76b267..2a13ea7e2b1f07f51b9a297d4ea89106bd237eaa 100644
(file)
--- a/
src/dfb/dcclient.cpp
+++ b/
src/dfb/dcclient.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: src/dfb/dcclient.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: src/dfb/dcclient.cpp
-// Purpose: wxWindowDC
, wxClientDC
and wxPaintDC
+// Purpose: wxWindowDC
Impl, wxClientDCImpl
and wxPaintDC
// Author: Vaclav Slavik
// Created: 2006-08-10
// RCS-ID: $Id$
// Author: Vaclav Slavik
// Created: 2006-08-10
// RCS-ID: $Id$
@@
-23,13
+23,12
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#include "wx/dcclient.h"
-
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/nonownedwnd.h"
#endif
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/nonownedwnd.h"
#endif
+#include "wx/dfb/dcclient.h"
#include "wx/dfb/private.h"
#define TRACE_PAINT "paint"
#include "wx/dfb/private.h"
#define TRACE_PAINT "paint"
@@
-93,21
+92,22
@@
wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
-// wxWindowDC
+// wxWindowDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxWindowDC, wxDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxWindowDCImpl, wxDFBDCImpl
)
-wxWindowDC::wxWindowDC(wxWindow *win)
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *win)
+ : wxDFBDCImpl(owner)
{
InitForWin(win, NULL);
}
{
InitForWin(win, NULL);
}
-void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
+void wxWindowDC
Impl
::InitForWin(wxWindow *win, const wxRect *rect)
{
wxCHECK_RET( win, "invalid window" );
{
wxCHECK_RET( win, "invalid window" );
- m_win = win;
+ m_win
dow
= win;
// obtain the surface used for painting:
wxPoint origin;
// obtain the surface used for painting:
wxPoint origin;
@@
-197,7
+197,7
@@
void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
SetDeviceOrigin(origin.x, origin.y);
}
SetDeviceOrigin(origin.x, origin.y);
}
-wxWindowDC
::~wxWindowDC
()
+wxWindowDC
Impl::~wxWindowDCImpl
()
{
wxIDirectFBSurfacePtr surface(GetDirectFBSurface());
if ( !surface )
{
wxIDirectFBSurfacePtr surface(GetDirectFBSurface());
if ( !surface )
@@
-211,7
+211,7
@@
wxWindowDC::~wxWindowDC()
{
// paint overlays on top of the surface being drawn to by this DC
// before showing anything on the screen:
{
// paint overlays on top of the surface being drawn to by this DC
// before showing anything on the screen:
-
m_win
->PaintOverlays(m_winRect);
+
GetWindow()
->PaintOverlays(m_winRect);
DFBSurfaceCapabilities caps = DSCAPS_NONE;
surface->GetCapabilities(&caps);
DFBSurfaceCapabilities caps = DSCAPS_NONE;
surface->GetCapabilities(&caps);
@@
-227,12
+227,13
@@
wxWindowDC::~wxWindowDC()
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
-// wxClientDC
+// wxClientDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxClientDC, wxWindowDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl
)
-wxClientDC::wxClientDC(wxWindow *win)
+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
+ : wxWindowDCImpl(owner, win)
{
wxCHECK_RET( win, "invalid window" );
{
wxCHECK_RET( win, "invalid window" );
@@
-244,4
+245,4
@@
wxClientDC::wxClientDC(wxWindow *win)
// wxPaintDC
//-----------------------------------------------------------------------------
// wxPaintDC
//-----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxPaintDC, wxWindowDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl
)