Fixed GtkBorder allocation (hopefully)

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

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 7b49e1150d3a8a3447a1ca130b65b76d59d4ce90..0bf2b128e9743c61c042dd35c7225180f5b8ceff 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -350,7 +350,7 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
     #if GTK_CHECK_VERSION(2,14,0)
         newBorder = gtk_border_new();
     #else
     #if GTK_CHECK_VERSION(2,14,0)
         newBorder = gtk_border_new();
     #else

-        newBorder = new GtkBorder;
+        newBorder = g_slice_new0(GtkBorder);

     #endif
         // Use some reasonable defaults for initial margins
         newBorder->left = 2;
     #endif
         // Use some reasonable defaults for initial margins
         newBorder->left = 2;


@@ -370,6 +370,12 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 
     gtk_entry_set_inner_border(entry, newBorder);
 
 
     gtk_entry_set_inner_border(entry, newBorder);
 

+#if GTK_CHECK_VERSION(2,14,0)
+    gtk_border_free(newBorder);
+#else
+    g_slice_free(GtkBorder, newBorder);
+#endif
+

     return true;
 #else
     wxUnusedVar(margins);
     return true;
 #else
     wxUnusedVar(margins);