X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96f201da8b08391fd719ad74875b87afacc8fc97..54c13c66d2c465ae00fc4e59c29312bb16eccdc4:/src/motif/dcclient.cpp?ds=sidebyside

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 7e2c71d1c8..1d4cca6560 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1180,8 +1180,8 @@ void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *heigh
         // TODO: this should be an error log function
         wxFAIL_MSG("set a valid font before calling GetTextExtent!");
 
-        *width = -1;
-        *height = -1;
+        if (width) *width = -1;
+        if (height) *height = -1;
         return;
     }
 
@@ -1207,8 +1207,8 @@ void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *heigh
         XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
         &ascent, &descent2, &overall);
 
-    *width = XDEV2LOGREL (overall.width);
-    *height = YDEV2LOGREL (ascent + descent2);
+    if (width) *width = XDEV2LOGREL (overall.width);
+    if (height) *height = YDEV2LOGREL (ascent + descent2);
     if (descent)
         *descent = descent2;
     if (externalLeading)
@@ -1992,7 +1992,7 @@ void wxWindowDC::SetDCClipping()
 
 void wxWindowDC::DoSetClippingRegion( long x, long y, long width, long height )
 {
-    wxDC::SetClippingRegion( x, y, width, height );
+    wxDC::DoSetClippingRegion( x, y, width, height );
 
     if (m_userRegion)
         XDestroyRegion ((Region) m_userRegion);
@@ -2023,7 +2023,7 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 {
     wxRect box = region.GetBox();
 
-    wxDC::SetClippingRegion( box.x, box.y, box.width, box.height );
+    wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
 
     if (m_userRegion)
         XDestroyRegion ((Region) m_userRegion);