delay setting the window shape until it is realized (slightly modified patch 1935497)

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 2fa607c415b913186afb491b84bfefd69c99ed10..61ec62fc9aea8d65ebd9bf9400163560150c6cb4 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -107,6 +107,9 @@ public:
     // size of WM decorations
     wxSize m_decorSize;
 
     // size of WM decorations
     wxSize m_decorSize;
 

+    // shape of the frame
+    wxRegion m_shape;
+

     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;

diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index df4afac07e1e390a2f0f5d9ae137f4231de864b5..7a371fbdda3bede4f88b6cae12b3a82f596f6197 100644 (file)
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -107,7 +107,6 @@ public:
     void OnMouseMove(wxMouseEvent& evt);
     void OnExit(wxMouseEvent& evt);
     void OnPaint(wxPaintEvent& evt);
     void OnMouseMove(wxMouseEvent& evt);
     void OnExit(wxMouseEvent& evt);
     void OnPaint(wxPaintEvent& evt);

-    void OnWindowCreate(wxWindowCreateEvent& evt);

 
 private:
     bool     m_hasShape;
 
 private:
     bool     m_hasShape;


@@ -290,12 +289,7 @@ BEGIN_EVENT_TABLE(ShapedFrame, wxFrame)
     EVT_LEFT_UP(ShapedFrame::OnLeftUp)
     EVT_MOTION(ShapedFrame::OnMouseMove)
     EVT_RIGHT_UP(ShapedFrame::OnExit)
     EVT_LEFT_UP(ShapedFrame::OnLeftUp)
     EVT_MOTION(ShapedFrame::OnMouseMove)
     EVT_RIGHT_UP(ShapedFrame::OnExit)

-

     EVT_PAINT(ShapedFrame::OnPaint)
     EVT_PAINT(ShapedFrame::OnPaint)

-
-#ifdef __WXGTK__
-    EVT_WINDOW_CREATE(ShapedFrame::OnWindowCreate)
-#endif

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -314,14 +308,7 @@ ShapedFrame::ShapedFrame(wxFrame *parent)
     m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG);
     SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
     SetToolTip(wxT("Right-click to close"));
     m_bmp = wxBitmap(_T("star.png"), wxBITMAP_TYPE_PNG);
     SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
     SetToolTip(wxT("Right-click to close"));

-
-#ifndef __WXGTK__
-    // On wxGTK we can't do this yet because the window hasn't been created
-    // yet so we wait until the EVT_WINDOW_CREATE event happens.  On wxMSW and
-    // wxMac the window has been created at this point so we go ahead and set
-    // the shape now.

     SetWindowShape();
     SetWindowShape();

-#endif

 }
 
 void ShapedFrame::SetWindowShape()
 }
 
 void ShapedFrame::SetWindowShape()


@@ -381,11 +368,6 @@ void ShapedFrame::OnPaint(wxPaintEvent& WXUNUSED(evt))
     dc.DrawBitmap(m_bmp, 0, 0, true);
 }
 
     dc.DrawBitmap(m_bmp, 0, 0, true);
 }
 

-void ShapedFrame::OnWindowCreate(wxWindowCreateEvent& WXUNUSED(evt))
-{
-    SetWindowShape();
-}
-

 // ----------------------------------------------------------------------------
 // see-through frame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // see-through frame
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f79d8234e53ca518a6f1dd72dc002b131f24d1d6..94b65ad038102ec53bd23b33d712efedfd971ce9 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -324,6 +324,9 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
         win->SetIcon( wxNullIcon );
         win->SetIcons( iconsOld );
     }
         win->SetIcon( wxNullIcon );
         win->SetIcons( iconsOld );
     }

+
+    if (win->HasFlag(wxFRAME_SHAPED))
+        win->SetShape(win->m_shape); // it will really set the window shape now

 }
 }
 
 }
 }
 


@@ -1164,13 +1167,22 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 

-    GdkWindow *window = NULL;
-    if (m_wxwindow)
+    if ( GTK_WIDGET_REALIZED(m_widget) )
+    {
+        if ( m_wxwindow )
+            do_shape_combine_region(m_wxwindow->window, region);
+
+        return do_shape_combine_region(m_widget->window, region);
+    }
+    else // not realized yet

     {
     {

-        do_shape_combine_region(m_wxwindow->window, region);
+        // store the shape to set, it will be really set once we're realized
+        m_shape = region;
+
+        // we don't know if we're going to succeed or fail, be optimistic by
+        // default
+        return true;

     }
     }

-    window = m_widget->window;
-    return do_shape_combine_region(window, region);

 }
 
 bool wxTopLevelWindowGTK::IsActive()
 }
 
 bool wxTopLevelWindowGTK::IsActive()