Fixed GtkBorder allocation (hopefully)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -350,7 +350,7 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
|
|||||||
#if GTK_CHECK_VERSION(2,14,0)
|
#if GTK_CHECK_VERSION(2,14,0)
|
||||||
newBorder = gtk_border_new();
|
newBorder = gtk_border_new();
|
||||||
#else
|
#else
|
||||||
newBorder = new GtkBorder;
|
newBorder = g_slice_new0(GtkBorder);
|
||||||
#endif
|
#endif
|
||||||
// Use some reasonable defaults for initial margins
|
// Use some reasonable defaults for initial margins
|
||||||
newBorder->left = 2;
|
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;
|
return true;
|
||||||
#else
|
#else
|
||||||
wxUnusedVar(margins);
|
wxUnusedVar(margins);
|
||||||
|
Reference in New Issue
Block a user