add a critical section protecting ms_prev variables (replaces patch 1819224)

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index cb4a9cb491ba410cc4320a030ed6f01a8e49d8b1..51ac28e480371d7d32c956c5da3aea56f43c638f 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -167,9 +167,10 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
-                                          GdkEventFocus *WXUNUSED(gdk_event),
-                                          wxTopLevelWindowGTK *win )
+static
+gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
+                                      GdkEventFocus *WXUNUSED(gdk_event),
+                                      wxTopLevelWindowGTK * WXUNUSED(win))
 {
     // if the focus goes out of our app alltogether, OnIdle() will send
     // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
@@ -444,30 +445,6 @@ static gboolean property_notify_event(
 }
 }
 
-//-----------------------------------------------------------------------------
-// "expose_event" of m_client
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static gboolean
-gtk_window_expose_callback( GtkWidget *widget,
-                            GdkEventExpose *gdk_event,
-                            wxWindow *win )
-{
-    GtkPizza *pizza = GTK_PIZZA(widget);
-
-    gtk_paint_flat_box (win->m_widget->style,
-                        pizza->bin_window, GTK_STATE_NORMAL,
-                        GTK_SHADOW_NONE,
-                        &gdk_event->area,
-                        win->m_widget,
-                        (char *)"base",
-                        0, 0, -1, -1);
-
-    return FALSE;
-}
-}
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowGTK creation
 // ----------------------------------------------------------------------------
@@ -596,13 +573,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 
-    if (m_miniEdge == 0) // wxMiniFrame has its own version.
-    {
-       // For m_mainWidget themes
-       g_signal_connect (m_mainWidget, "expose_event",
-                         G_CALLBACK (gtk_window_expose_callback), this);
-    }
-
     // m_wxwindow only represents the client area without toolbar and menubar
     m_wxwindow = gtk_pizza_new();
     gtk_widget_show( m_wxwindow );