From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 18 Jun 2007 06:03:50 +0000 (+0000)
Subject: gtk_border_free is for freeing GtkBorder's, not g_free.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6cfdfed86be9ecc905ec1fe80937f3534e1807ed?hp=9ce97705fc6314a502378020bffd5be1cfbe20e8

gtk_border_free is for freeing GtkBorder's, not g_free.
Using g_free instead used to have no ill effects as gtk_border_free called that anyway, but in gtk+-2.11 GtkBorder
uses GSlice and gtk_border_free therefore uses g_slice_free and using g_free makes things crash hard.
So fix it or wxGTK won't work with the upcoming gtk+-2.12 stable release planned for end of July.


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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e9b395f835..71cfd13497 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -71,7 +71,7 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
             right_border += default_border->right;
             top_border += default_border->top;
             bottom_border += default_border->bottom;
-            g_free( default_border );
+            gtk_border_free( default_border );
         }
         win->MoveWindow(
             win->m_x - top_border,
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 7b24565135..5ccb022670 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2738,7 +2738,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
                 right_border += default_border->right;
                 top_border += default_border->top;
                 bottom_border += default_border->bottom;
-                g_free( default_border );
+                gtk_border_free( default_border );
             }
         }