Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid deprecated functions and direct struct access

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-03-28 06:27:49 +00:00
parent 989d151ce2
commit 385e8575dd
50 changed files with 535 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/statbox.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/gtk/private/win_gtk.h" // for wxPizza
#include <gtk/gtk.h>
#include "wx/gtk/private/gtk2-compat.h"
// constants taken from GTK sources
#define LABEL_PAD 1
@@ -31,15 +32,16 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
// clip label as GTK >= 2.12 does
GtkWidget* label_widget = gtk_frame_get_label_widget(GTK_FRAME(widget));
int w = alloc->width -
2 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
2 * gtk_widget_get_style(widget)->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
if (w < 0)
w = 0;
if (label_widget->allocation.width > w)
GtkAllocation a;
gtk_widget_get_allocation(label_widget, &a);
if (a.width > w)
{
GtkAllocation alloc2 = label_widget->allocation;
alloc2.width = w;
gtk_widget_size_allocate(label_widget, &alloc2);
a.width = w;
gtk_widget_size_allocate(label_widget, &a);
}
}
}