From 47b4ed41cb38b4c2f1ac14028faf5bc853cdac26 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Sun, 15 Dec 2013 02:04:41 +0000
Subject: [PATCH] just put GtkBorder variable on the stack fixes missing
 runtime version check

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/textentry.cpp | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 339c86bd44..d4eb406c43 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -462,42 +462,29 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 #endif
 
     const GtkBorder* oldBorder = gtk_entry_get_inner_border(entry);
-    GtkBorder* newBorder;
+    GtkBorder newBorder;
 
     if ( oldBorder )
-    {
-        newBorder = gtk_border_copy(oldBorder);
-    }
+        newBorder = *oldBorder;
     else
     {
-    #if GTK_CHECK_VERSION(2,14,0)
-        newBorder = gtk_border_new();
-    #else
-        newBorder = g_slice_new0(GtkBorder);
-    #endif
         // Use some reasonable defaults for initial margins
-        newBorder->left = 2;
-        newBorder->right = 2;
+        newBorder.left = 2;
+        newBorder.right = 2;
 
         // These numbers seem to let the text remain vertically centered
         // in common use scenarios when margins.y == -1.
-        newBorder->top = 3;
-        newBorder->bottom = 3;
+        newBorder.top = 3;
+        newBorder.bottom = 3;
     }
 
     if ( margins.x != -1 )
-        newBorder->left = (gint) margins.x;
+        newBorder.left = margins.x;
 
     if ( margins.y != -1 )
-        newBorder->top = (gint) margins.y;
+        newBorder.top = margins.y;
 
-    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
+    gtk_entry_set_inner_border(entry, &newBorder);
 
     return true;
 #else