first attempt at adding the minimal set needed for dead-key support, see #15345

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 770ce7b1162d89d7bbedeab80cfb3b11165da707..b63b370645e3d5935b765a44bb8db14139192741 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/control.cpp
 // Purpose:     wxControl implementation for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -105,7 +104,6 @@ void wxControl::PostCreation(const wxSize& size)
     gtk_widget_ensure_style(m_widget);
 #endif
 
-    GTKApplyWidgetStyle();
     SetInitialSize(size);
 }
 
@@ -317,16 +315,7 @@ wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const
 {
     GtkRequisition req;
 #ifdef __WXGTK3__
-    if (gtk_widget_get_request_mode(widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
-    {
-        gtk_widget_get_preferred_height(widget, NULL, &req.height);
-        gtk_widget_get_preferred_width_for_height(widget, req.height, NULL, &req.width);
-    }
-    else
-    {
-        gtk_widget_get_preferred_width(widget, NULL, &req.width);
-        gtk_widget_get_preferred_height_for_width(widget, req.width, NULL, &req.height);
-    }
+    gtk_widget_get_preferred_size(widget, NULL, &req);
 #else
     GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req);
 #endif