From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 22 Sep 2009 10:58:06 +0000 (+0000)
Subject: Fixed wxBORDER_THEME breakage
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ec2d6790e96921e031555eac66bb924b0eb6c1a0?ds=inline

Fixed wxBORDER_THEME breakage


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index dcbe4fa282..729463a3ad 100644
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -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();
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 2e71c0bdbd..84846a243a 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -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