Fixed wxBORDER_THEME breakage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -381,7 +381,7 @@ void wxPizza::get_border_widths(int& x, int& y)
|
||||
#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();
|
||||
|
||||
|
@@ -4364,7 +4364,7 @@ void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
|
||||
|
||||
if(wxstyle & wxBORDER_RAISED)
|
||||
gtkstyle = GTK_SHADOW_OUT;
|
||||
else if (wxstyle & wxBORDER_SUNKEN)
|
||||
else if ((wxstyle & wxBORDER_SUNKEN) || (wxstyle & wxBORDER_THEME))
|
||||
gtkstyle = GTK_SHADOW_IN;
|
||||
#if 0
|
||||
// Now obsolete
|
||||
|
Reference in New Issue
Block a user