support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,10 +13,10 @@
|
||||
#if wxUSE_STATBOX
|
||||
|
||||
#include "wx/statbox.h"
|
||||
#include "wx/gtk/private/win_gtk.h" // for wxPizza
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include "wx/gtk/private/gtk2-compat.h"
|
||||
#include "wx/gtk/private/win_gtk.h"
|
||||
|
||||
// constants taken from GTK sources
|
||||
#define LABEL_PAD 1
|
||||
@@ -26,6 +26,7 @@
|
||||
// "size_allocate" from m_widget
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef __WXGTK3__
|
||||
extern "C" {
|
||||
static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
|
||||
{
|
||||
@@ -45,6 +46,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxStaticBox
|
||||
@@ -99,11 +101,13 @@ bool wxStaticBox::Create( wxWindow *parent,
|
||||
|
||||
gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5);
|
||||
|
||||
#ifndef __WXGTK3__
|
||||
if (gtk_check_version(2, 12, 0))
|
||||
{
|
||||
// we connect this signal to perform label-clipping as GTK >= 2.12 does
|
||||
g_signal_connect(m_widget, "size_allocate", G_CALLBACK(size_allocate), NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user