From 4c8e701d84dbaf8d20ee7a1d22721ad34ca36fcb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 14:48:14 +0100
Subject: [PATCH] Remove wxGTKCairoDCImpl ctor taking dummy int

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.
---
 include/wx/gtk/dc.h |  1 -
 src/gtk/dc.cpp      | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 3c8619cb8a..f0807e3d12 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -17,7 +17,6 @@ class wxGTKCairoDCImpl: public wxGCDCImpl
 {
 public:
     wxGTKCairoDCImpl(wxDC* owner);
-    wxGTKCairoDCImpl(wxDC* owner, int);
     wxGTKCairoDCImpl(wxDC* owner, double scaleFactor);
     wxGTKCairoDCImpl(wxDC* owner, wxWindow* window);
 
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 79c90e20d2..61f3951724 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -28,13 +28,6 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
     m_height = 0;
 }
 
-wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
-    : wxGCDCImpl(owner, 0)
-{
-    m_width = 0;
-    m_height = 0;
-}
-
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
     : wxGCDCImpl(owner, 0)
 {
@@ -46,13 +39,17 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
     : wxGCDCImpl(owner, 0)
 {
-    m_window = window;
-    m_font = window->GetFont();
-    m_textForegroundColour = window->GetForegroundColour();
-    m_textBackgroundColour = window->GetBackgroundColour();
     m_width = 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)
@@ -357,7 +354,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
 //-----------------------------------------------------------------------------
 
 wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
-    : wxGTKCairoDCImpl(owner, 0)
+    : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
 {
     GdkWindow* window = gdk_get_default_root_window();
     InitSize(window);
@@ -383,7 +380,7 @@ wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
-    : wxGTKCairoDCImpl(owner, 0)
+    : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
     , m_bitmap(bitmap)
 {
     Setup();