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

Remove wxGTKCairoDCImpl ctor taking dummy int

Browse Source 
We can reuse another ctor taking wxWindow* instead. Although this does
require an ugly cast, it's more explicit than just passing 0 which
could, in principle, match both the ctor taking wxWindow* and another
one taking double, and so is still preferable.
This commit is contained in:
Vadim Zeitlin
2018-01-25 14:48:14 +01:00
parent 0be81cb34b
commit 4c8e701d84
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/gtk/dc.h
View File

@@ -17,7 +17,6 @@ class wxGTKCairoDCImpl: public wxGCDCImpl
{ {
public: public:
wxGTKCairoDCImpl(wxDC* owner); wxGTKCairoDCImpl(wxDC* owner);
wxGTKCairoDCImpl(wxDC* owner, int);
wxGTKCairoDCImpl(wxDC* owner, double scaleFactor); wxGTKCairoDCImpl(wxDC* owner, double scaleFactor);
wxGTKCairoDCImpl(wxDC* owner, wxWindow* window); wxGTKCairoDCImpl(wxDC* owner, wxWindow* window);

25
src/gtk/dc.cpp
View File

@@ -28,13 +28,6 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
m_height = 0; m_height = 0;
} }
wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
: wxGCDCImpl(owner, 0)
{
m_width = 0;
m_height = 0;
}
wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor) wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
: wxGCDCImpl(owner, 0) : wxGCDCImpl(owner, 0)
{ {
@@ -46,13 +39,17 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window) wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
: wxGCDCImpl(owner, 0) : wxGCDCImpl(owner, 0)
{ {
m_window = window;
m_font = window->GetFont();
m_textForegroundColour = window->GetForegroundColour();
m_textBackgroundColour = window->GetBackgroundColour();
m_width = 0; m_width = 0;
m_height = 0; m_height = 0;
m_contentScaleFactor = window->GetContentScaleFactor();
if ( window )
{
m_window = window;
m_font = window->GetFont();
m_textForegroundColour = window->GetForegroundColour();
m_textBackgroundColour = window->GetBackgroundColour();
m_contentScaleFactor = window->GetContentScaleFactor();
}
} }
void wxGTKCairoDCImpl::InitSize(GdkWindow* window) void wxGTKCairoDCImpl::InitSize(GdkWindow* window)
@@ -357,7 +354,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner) wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
: wxGTKCairoDCImpl(owner, 0) : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
{ {
GdkWindow* window = gdk_get_default_root_window(); GdkWindow* window = gdk_get_default_root_window();
InitSize(window); InitSize(window);
@@ -383,7 +380,7 @@ wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
} }
wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap) wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
: wxGTKCairoDCImpl(owner, 0) : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
, m_bitmap(bitmap) , m_bitmap(bitmap)
{ {
Setup(); Setup();