From 9928536b3a83586c473c96000c2d3a32e4c3f576 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Jun 2008 17:05:45 +0000 Subject: [PATCH] remove Create{Window,Client,Paint}DC() methods without window parameter -- they don't make sense as these DCs must always be associated with a window and are unusable if created without it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 6 ------ src/common/dcbase.cpp | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index 8599c02433..9c8974f8ae 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -116,11 +116,8 @@ public: wxDCFactory() {} virtual ~wxDCFactory() {} - virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner ) = 0; virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0; - virtual wxDCImpl* CreateClientDC( wxClientDC *owner ) = 0; virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0; - virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner ) = 0; virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0; virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0; virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0; @@ -146,11 +143,8 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory public: wxNativeDCFactory() {} - virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner ); virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ); - virtual wxDCImpl* CreateClientDC( wxClientDC *owner ); virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ); - virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner ); virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ); virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ); virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ); diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 1d0505599a..ee83c03fda 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -131,31 +131,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCFactoryCleanupModule, wxModule) // wxNativeDCFactory //----------------------------------------------------------------------------- -wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner ) -{ - return new wxWindowDCImpl( owner ); -} - wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner, wxWindow *window ) { return new wxWindowDCImpl( owner, window ); } -wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner ) -{ - return new wxClientDCImpl( owner ); -} - wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner, wxWindow *window ) { return new wxClientDCImpl( owner, window ); } -wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner ) -{ - return new wxPaintDCImpl( owner ); -} - wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner, wxWindow *window ) { return new wxPaintDCImpl( owner, window );