}
widget->allocation = *alloc;
-
+
// adjust child positions
for (const GList* list = pizza->m_fixed.children; list; list = list->next)
{
if (GTK_WIDGET_VISIBLE(child->widget))
{
GtkAllocation child_old_alloc = child->widget->allocation;
-
+
GtkAllocation child_alloc;
// note that child positions do not take border into
// account, they need to be relative to widget->window,
return type;
}
-GtkWidget* wxPizza::New(long windowStyle)
+GtkWidget* wxPizza::New(long windowStyle,void* owner)
{
GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
wxPizza* pizza = WX_PIZZA(widget);
+ pizza->m_owner = owner;
pizza->m_backing_window = NULL;
pizza->m_scroll_x = 0;
pizza->m_scroll_y = 0;
const AdjustData* p = static_cast<AdjustData*>(data);
widget->allocation.x += p->dx;
widget->allocation.y += p->dy;
-
+
if (widget->window == p->window)
{
// GtkFrame requires a queue_resize, otherwise parts of
x = y = 0;
if (m_border_style == 0)
return;
-
+
#ifndef __WXUNIVERSAL__
if (m_border_style & wxBORDER_SIMPLE)
x = y = 1;
- else if (m_is_scrollable || (m_border_style & wxBORDER_THEME))
+ else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */)
{
GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
-
+
if (style_widget->style)
{
x = style_widget->style->xthickness;
y = style_widget->style->ythickness;
}
}
- else
+ else
{
GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
-
+
if (style_widget->style)
{
x = style_widget->style->xthickness;