Check for null return value in wxClientDC constructor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index eb9d6e467be9e033484a5089a8b8a46e2f262042..bc1a0827a4c0771d88473aa77cd1b3b0bcf34dbe 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -85,6 +85,8 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
        wxSize size = window->GetClientSize() ;

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index eb9d6e467be9e033484a5089a8b8a46e2f262042..bc1a0827a4c0771d88473aa77cd1b3b0bcf34dbe 100644 (file)
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -85,6 +85,8 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+        if (!rootwindow)
+            return;
        WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
        wxSize size = window->GetClientSize() ;