Don't take hidden wxGrid row/columns into account when auto-sizing.

[wxWidgets.git] / src / gtk / nonownedwnd.cpp

diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp
index 0e6226877def5430371fbe156ac4b7c8f7fb2ffb..2bd4cb99381a74d55f5c82692363a8a5d37cfb7a 100644 (file)
--- a/src/gtk/nonownedwnd.cpp
+++ b/src/gtk/nonownedwnd.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK implementation of wxNonOwnedWindow.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-12
-// RCS-ID:      $Id$
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -188,15 +187,15 @@ private:
 
     virtual bool DoSetShape(GdkWindow *window)
     {
-        if (m_mask.GetBitmap() == NULL)
+        if (!m_mask)
             return false;
 
 #ifdef __WXGTK3__
-        cairo_region_t* region = gdk_cairo_region_create_from_surface(m_mask.GetBitmap());
+        cairo_region_t* region = gdk_cairo_region_create_from_surface(m_mask);
         gdk_window_shape_combine_region(window, region, 0, 0);
         cairo_region_destroy(region);
 #else
-        gdk_window_shape_combine_mask(window, m_mask.GetBitmap(), 0, 0);
+        gdk_window_shape_combine_mask(window, m_mask, 0, 0);
 #endif
 
         return true;