Don't draw flat box unless background style is system
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -632,7 +632,7 @@ static void gtk_window_draw_callback( GtkWidget *widget,
|
|||||||
#ifndef __WXUNIVERSAL__
|
#ifndef __WXUNIVERSAL__
|
||||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||||
|
|
||||||
if (win->GetThemeEnabled() && win->GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
|
if (win->GetThemeEnabled() && win->GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
|
||||||
{
|
{
|
||||||
wxWindow *parent = win->GetParent();
|
wxWindow *parent = win->GetParent();
|
||||||
while (parent && !parent->IsTopLevel())
|
while (parent && !parent->IsTopLevel())
|
||||||
@@ -3943,7 +3943,7 @@ void wxWindowGTK::GtkSendPaintEvents()
|
|||||||
// widget to draw on
|
// widget to draw on
|
||||||
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
|
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
|
||||||
|
|
||||||
if (GetThemeEnabled() && GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
|
if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
|
||||||
{
|
{
|
||||||
// find ancestor from which to steal background
|
// find ancestor from which to steal background
|
||||||
wxWindow *parent = GetParent();
|
wxWindow *parent = GetParent();
|
||||||
|
@@ -632,7 +632,7 @@ static void gtk_window_draw_callback( GtkWidget *widget,
|
|||||||
#ifndef __WXUNIVERSAL__
|
#ifndef __WXUNIVERSAL__
|
||||||
GtkPizza *pizza = GTK_PIZZA (widget);
|
GtkPizza *pizza = GTK_PIZZA (widget);
|
||||||
|
|
||||||
if (win->GetThemeEnabled() && win->GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
|
if (win->GetThemeEnabled() && win->GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
|
||||||
{
|
{
|
||||||
wxWindow *parent = win->GetParent();
|
wxWindow *parent = win->GetParent();
|
||||||
while (parent && !parent->IsTopLevel())
|
while (parent && !parent->IsTopLevel())
|
||||||
@@ -3943,7 +3943,7 @@ void wxWindowGTK::GtkSendPaintEvents()
|
|||||||
// widget to draw on
|
// widget to draw on
|
||||||
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
|
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
|
||||||
|
|
||||||
if (GetThemeEnabled() && GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
|
if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
|
||||||
{
|
{
|
||||||
// find ancestor from which to steal background
|
// find ancestor from which to steal background
|
||||||
wxWindow *parent = GetParent();
|
wxWindow *parent = GetParent();
|
||||||
|
Reference in New Issue
Block a user