first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -521,18 +521,20 @@ gtk_pizza_realize (GtkWidget *widget)
|
||||
attributes.width = widget->allocation.width;
|
||||
attributes.height = widget->allocation.height;
|
||||
|
||||
#ifndef __WXUNIVERSAL__
|
||||
if (pizza->shadow_type == GTK_MYSHADOW_NONE)
|
||||
{
|
||||
/* no border, no changes to sizes */
|
||||
} else
|
||||
if (pizza->shadow_type == GTK_MYSHADOW_THIN)
|
||||
}
|
||||
else if (pizza->shadow_type == GTK_MYSHADOW_THIN)
|
||||
{
|
||||
/* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */
|
||||
attributes.x += 1;
|
||||
attributes.y += 1;
|
||||
attributes.width -= 2;
|
||||
attributes.height -= 2;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
/* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */
|
||||
/* GTK_MYSHADOW_OUT == wxRAISED_BORDER */
|
||||
@@ -541,6 +543,7 @@ gtk_pizza_realize (GtkWidget *widget)
|
||||
attributes.width -= 4;
|
||||
attributes.height -= 4;
|
||||
}
|
||||
#endif /* __WXUNIVERSAL__ */
|
||||
|
||||
/* minimal size */
|
||||
if (attributes.width < 2) attributes.width = 2;
|
||||
|
Reference in New Issue
Block a user