Avoid unrealizing a frozen window

It seems to continue to prevent updates to the affected area

Fixes #13543


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

include/wx/gtk/window.h

@@ -204,6 +204,7 @@ public:
     // Called when m_widget becomes realized. Derived classes must call the
     // base class method if they override it.
     virtual void GTKHandleRealized();
+    void GTKHandleUnrealize();
 
 protected:
     // for controls composed of multiple GTK widgets, return true to eliminate

src/gtk/textctrl.cpp

@@ -1831,12 +1831,10 @@ void wxTextCtrl::DoFreeze()
 {
     wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
 
-    wxWindow::DoFreeze();
+    GTKFreezeWidget(m_text);
 
     if ( HasFlag(wxTE_MULTILINE) )
     {
-        GTKFreezeWidget(m_text);
-
         // removing buffer dramatically speeds up insertion:
         g_object_ref(m_buffer);
         GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
@@ -1877,12 +1875,9 @@ void wxTextCtrl::DoThaw()
                 GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
             m_showPositionOnThaw = NULL;
         }
-
-        // and thaw the window
-        GTKThawWidget(m_text);
     }
 
-    wxWindow::DoThaw();
+    GTKThawWidget(m_text);
 }
 
 // ----------------------------------------------------------------------------

src/gtk/window.cpp

@@ -1970,22 +1970,21 @@ static void style_updated(GtkWidget*, GtkStyle*, wxWindow* win)
 }
 
 //-----------------------------------------------------------------------------
-// "unrealize" from m_wxwindow
+// "unrealize"
 //-----------------------------------------------------------------------------
 
 static void unrealize(GtkWidget*, wxWindow* win)
 {
-    if (win->m_imData)
+    win->GTKHandleUnrealize();
-        gtk_im_context_set_client_window(win->m_imData->context, NULL);
-
-    g_signal_handlers_disconnect_by_func(
-        win->m_wxwindow, (void*)style_updated, win);
 }
 
 } // extern "C"
 
 void wxWindowGTK::GTKHandleRealized()
 {
+    if (IsFrozen())
+        DoFreeze();
+
     if (m_imData)
     {
         gtk_im_context_set_client_window
@@ -2048,6 +2047,23 @@ void wxWindowGTK::GTKHandleRealized()
     }
 }
 
+void wxWindowGTK::GTKHandleUnrealize()
+{
+    // unrealizing a frozen window seems to have some lingering effect
+    // preventing updates to the affected area
+    if (IsFrozen())
+        DoThaw();
+
+    if (m_wxwindow)
+    {
+        if (m_imData)
+            gtk_im_context_set_client_window(m_imData->context, NULL);
+
+        g_signal_handlers_disconnect_by_func(
+            m_wxwindow, (void*)style_updated, this);
+    }
+}
+
 // ----------------------------------------------------------------------------
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
@@ -2453,7 +2469,6 @@ void wxWindowGTK::PostCreation()
 
         g_signal_connect (m_imData->context, "commit",
                           G_CALLBACK (gtk_wxwindow_commit_cb), this);
-        g_signal_connect(m_wxwindow, "unrealize", G_CALLBACK(unrealize), this);
     }
 
     // focus handling
@@ -2498,13 +2513,14 @@ void wxWindowGTK::PostCreation()
     // was in fact realized already.
     if ( gtk_widget_get_realized(connect_widget) )
     {
-        gtk_window_realized_callback(connect_widget, this);
+        GTKHandleRealized();
     }
     else
     {
         g_signal_connect (connect_widget, "realize",
                           G_CALLBACK (gtk_window_realized_callback), this);
     }
+    g_signal_connect(connect_widget, "unrealize", G_CALLBACK(unrealize), this);
 
     if (!IsTopLevel())
     {
@@ -4668,91 +4684,38 @@ GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
-extern "C"
+void wxWindowGTK::GTKFreezeWidget(GtkWidget* widget)
 {
-
+    if (widget && gtk_widget_get_has_window(widget))
-// this is called if we attempted to freeze unrealized widget when it finally
-// is realized (and so can be frozen):
-static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win)
     {
-    wxASSERT( w && gtk_widget_get_has_window(w) );
+        GdkWindow* window = gtk_widget_get_window(widget);
-    wxASSERT( gtk_widget_get_realized(w) );
+        if (window)
-
-    g_signal_handlers_disconnect_by_func
-    (
-        w,
-        (void*)wx_frozen_widget_realize,
-        win
-    );
-
-    GdkWindow* window;
-    if (w == win->m_wxwindow)
-        window = win->GTKGetDrawingWindow();
-    else
-        window = gtk_widget_get_window(w);
             gdk_window_freeze_updates(window);
     }
-
-} // extern "C"
-
-void wxWindowGTK::GTKFreezeWidget(GtkWidget *w)
-{
-    if ( !w || !gtk_widget_get_has_window(w) )
-        return; // window-less widget, cannot be frozen
-
-    GdkWindow* window = gtk_widget_get_window(w);
-    if (window == NULL)
-    {
-        // we can't thaw unrealized widgets because they don't have GdkWindow,
-        // so set it up to be done immediately after realization:
-        g_signal_connect_after
-        (
-            w,
-            "realize",
-            G_CALLBACK(wx_frozen_widget_realize),
-            this
-        );
-        return;
 }
 
-    if (w == m_wxwindow)
+void wxWindowGTK::GTKThawWidget(GtkWidget* widget)
-        window = GTKGetDrawingWindow();
-    gdk_window_freeze_updates(window);
-}
-
-void wxWindowGTK::GTKThawWidget(GtkWidget *w)
 {
-    if ( !w || !gtk_widget_get_has_window(w) )
+    if (widget && gtk_widget_get_has_window(widget))
-        return; // window-less widget, cannot be frozen
-
-    GdkWindow* window = gtk_widget_get_window(w);
-    if (window == NULL)
     {
-        // the widget wasn't realized yet, no need to thaw
+        GdkWindow* window = gtk_widget_get_window(widget);
-        g_signal_handlers_disconnect_by_func
+        if (window)
-        (
-            w,
-            (void*)wx_frozen_widget_realize,
-            this
-        );
-        return;
-    }
-
-    if (w == m_wxwindow)
-        window = GTKGetDrawingWindow();
             gdk_window_thaw_updates(window);
     }
+}
 
 void wxWindowGTK::DoFreeze()
 {
-    GTKFreezeWidget(m_widget);
+    GtkWidget* widget = m_wxwindow;
-    if ( m_wxwindow && m_widget != m_wxwindow )
+    if (widget == NULL)
-        GTKFreezeWidget(m_wxwindow);
+        widget = m_widget;
+    GTKFreezeWidget(widget);
 }
 
 void wxWindowGTK::DoThaw()
 {
-    GTKThawWidget(m_widget);
+    GtkWidget* widget = m_wxwindow;
-    if ( m_wxwindow && m_widget != m_wxwindow )
+    if (widget == NULL)
-        GTKThawWidget(m_wxwindow);
+        widget = m_widget;
+    GTKThawWidget(widget);
 }