From 4d2df97f6c86982383f1fb4beb45d66ab1e41879 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 29 Jan 2008 14:09:56 +0000 Subject: [PATCH] wx*DCImpl PCH-less compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dfb/dcmemory.h | 15 ++------------- src/dfb/dcmemory.cpp | 14 ++++++++++++++ src/dfb/dcscreen.cpp | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h index b7dd9c2d81..4ff01bd564 100644 --- a/include/wx/dfb/dcmemory.h +++ b/include/wx/dfb/dcmemory.h @@ -17,19 +17,8 @@ class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxDFBDCImpl { public: - wxMemoryDCImpl(wxMemoryDC *owner) - : wxDFBDCImpl(owner) - { - Init(); - } - - wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap) - : wxDFBDCImpl(owner) - { - Init(); - DoSelect(bitmap); - } - + wxMemoryDCImpl(wxMemoryDC *owner); + wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap); wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); // create compatible DC // override wxMemoryDC-specific base class virtual methods diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp index 4f274d960c..5c77771059 100644 --- a/src/dfb/dcmemory.cpp +++ b/src/dfb/dcmemory.cpp @@ -23,6 +23,7 @@ #include "wx/bitmap.h" #endif +#include "wx/dcmemory.h" #include "wx/dfb/dcmemory.h" #include "wx/dfb/private.h" @@ -42,6 +43,19 @@ void wxMemoryDCImpl::Init() { } +wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner) + : wxDFBDCImpl(owner) +{ + Init(); +} + +wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap) + : wxDFBDCImpl(owner) +{ + Init(); + DoSelect(bitmap); +} + wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc)) : wxDFBDCImpl(owner) { diff --git a/src/dfb/dcscreen.cpp b/src/dfb/dcscreen.cpp index 14f7cfa755..730903e87f 100644 --- a/src/dfb/dcscreen.cpp +++ b/src/dfb/dcscreen.cpp @@ -19,6 +19,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/dcscreen.h" #include "wx/dfb/dcscreen.h" #include "wx/dfb/private.h" -- 2.47.2