No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / include / wx / gtk / nonownedwnd.h

diff --git a/include/wx/gtk/nonownedwnd.h b/include/wx/gtk/nonownedwnd.h
index a722e276063d48108614ca3611cbbdfc35b1bc01..70e853c1ceeb5eb2f6e93ef6cfd5bc3400011880 100644 (file)
--- a/include/wx/gtk/nonownedwnd.h
+++ b/include/wx/gtk/nonownedwnd.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK-specific wxNonOwnedWindow declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-12
 // Purpose:     wxGTK-specific wxNonOwnedWindow declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-12

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,6 +10,8 @@
 #ifndef _WX_GTK_NONOWNEDWND_H_
 #define _WX_GTK_NONOWNEDWND_H_
 
 #ifndef _WX_GTK_NONOWNEDWND_H_
 #define _WX_GTK_NONOWNEDWND_H_
 

+class wxNonOwnedWindowShapeImpl;
+

 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow contains code common to wx{Popup,TopLevel}Window in wxGTK.
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow contains code common to wx{Popup,TopLevel}Window in wxGTK.
 // ----------------------------------------------------------------------------


@@ -18,16 +19,23 @@
 class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
 {
 public:
 class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
 {
 public:

-    wxNonOwnedWindow() { }
-
-    virtual bool SetShape(const wxRegion& region);
+    wxNonOwnedWindow() { m_shapeImpl = NULL; }
+    virtual ~wxNonOwnedWindow();

 
     // Overridden to actually set the shape when the window becomes realized.
     virtual void GTKHandleRealized();
 
 
     // Overridden to actually set the shape when the window becomes realized.
     virtual void GTKHandleRealized();
 

+protected:
+    virtual bool DoClearShape();
+    virtual bool DoSetRegionShape(const wxRegion& region);
+#if wxUSE_GRAPHICS_CONTEXT
+    virtual bool DoSetPathShape(const wxGraphicsPath& path);
+#endif // wxUSE_GRAPHICS_CONTEXT
+
+

 private:
 private:

-    // If valid, defines the custom shape of the window.
-    wxRegion m_shape;
+    // If non-NULL, contains information about custom window shape.
+    wxNonOwnedWindowShapeImpl* m_shapeImpl;

 
     wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow);
 };