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

Fixed wxBORDER_THEME breakage

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-22 10:58:06 +00:00
parent 7bc44d871c
commit ec2d6790e9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/win_gtk.cpp
View File

@@ -381,7 +381,7 @@ void wxPizza::get_border_widths(int& x, int& y)
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
if (m_border_style & wxBORDER_SIMPLE) if (m_border_style & wxBORDER_SIMPLE)
x = y = 1; 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(); GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();

2
src/gtk/window.cpp
View File

@@ -4364,7 +4364,7 @@ void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
if(wxstyle & wxBORDER_RAISED) if(wxstyle & wxBORDER_RAISED)
gtkstyle = GTK_SHADOW_OUT; gtkstyle = GTK_SHADOW_OUT;
else if (wxstyle & wxBORDER_SUNKEN) else if ((wxstyle & wxBORDER_SUNKEN) || (wxstyle & wxBORDER_THEME))
gtkstyle = GTK_SHADOW_IN; gtkstyle = GTK_SHADOW_IN;
#if 0 #if 0
// Now obsolete // Now obsolete