From 2034b748875bba52e3e98d85914dd1c372ff05c4 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 12 Feb 2002 14:56:54 +0000 Subject: [PATCH] Background set correctly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/toplevel.cpp | 9 ++++++++- src/x11/window.cpp | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 03dfa0dfef..fb3be5d0fd 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -39,7 +39,9 @@ #include "wx/statusbr.h" #endif //WX_PRECOMP +#include "wx/settings.h" #include "wx/x11/private.h" +#include "X11/Xutil.h" bool wxMWMIsRunning(Window w); @@ -88,7 +90,12 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, int xscreen = DefaultScreen( xdisplay ); Visual *xvisual = DefaultVisual( xdisplay, xscreen ); Window xparent = RootWindow( xdisplay, xscreen ); + Colormap cm = DefaultColormap( xdisplay, xscreen ); + // TODO: For dialogs, this should be wxSYS_COLOUR_3DFACE + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); + m_backgroundColour.CalcPixel( (WXColormap) cm ); + XSetWindowAttributes xattributes; XSizeHints size_hints; XWMHints wm_hints; @@ -96,7 +103,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, long xattributes_mask = CWOverrideRedirect | CWBorderPixel | CWBackPixel; - xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); + xattributes.background_pixel = m_backgroundColour.GetPixel(); xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); xattributes.override_redirect = False; diff --git a/src/x11/window.cpp b/src/x11/window.cpp index a9bb558858..ec6674bbf1 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -149,7 +149,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, xdisplay, parentWindow, x, y, w, h, 0, m_backgroundColour.GetPixel(), - m_foregroundColour.GetPixel() ); + m_backgroundColour.GetPixel() ); m_mainWidget = (WXWindow) window; @@ -956,7 +956,7 @@ void wxWindowX11::X11SendPaintEvents() { m_clipPaintRegion = TRUE; - if (!m_clearRegion.IsEmpty()) + // if (!m_clearRegion.IsEmpty()) { wxWindowDC dc( (wxWindow*)this ); dc.SetClippingRegion( m_clearRegion ); -- 2.45.2