Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-21 17:05:45 +00:00
parent 0f5a779f12
commit 9928536b3a
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/dc.h
View File

@@ -116,11 +116,8 @@ public:
wxDCFactory() {} wxDCFactory() {}
virtual ~wxDCFactory() {} virtual ~wxDCFactory() {}
virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner ) = 0;
virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 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* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0;
virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner ) = 0;
virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0; virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0;
virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0; virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0;
virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0; virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0;
@@ -146,11 +143,8 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory
public: public:
wxNativeDCFactory() {} wxNativeDCFactory() {}
virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner );
virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ); virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );
virtual wxDCImpl* CreateClientDC( wxClientDC *owner );
virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ); virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );
virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner );
virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ); virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ); virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ); virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );

15
src/common/dcbase.cpp
View File

@@ -131,31 +131,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCFactoryCleanupModule, wxModule)
// wxNativeDCFactory // wxNativeDCFactory
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner )
{
return new wxWindowDCImpl( owner );
}
wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner, wxWindow *window ) wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner, wxWindow *window )
{ {
return new wxWindowDCImpl( owner, window ); return new wxWindowDCImpl( owner, window );
} }
wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner )
{
return new wxClientDCImpl( owner );
}
wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner, wxWindow *window ) wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner, wxWindow *window )
{ {
return new wxClientDCImpl( owner, window ); return new wxClientDCImpl( owner, window );
} }
wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner )
{
return new wxPaintDCImpl( owner );
}
wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner, wxWindow *window ) wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner, wxWindow *window )
{ {
return new wxPaintDCImpl( owner, window ); return new wxPaintDCImpl( owner, window );