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

Background set correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-12 14:56:54 +00:00
parent 9f05ea2173
commit 2034b74887
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/x11/toplevel.cpp
View File

@@ -39,7 +39,9 @@
#include "wx/statusbr.h" #include "wx/statusbr.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/settings.h"
#include "wx/x11/private.h" #include "wx/x11/private.h"
#include "X11/Xutil.h"
bool wxMWMIsRunning(Window w); bool wxMWMIsRunning(Window w);
@@ -88,7 +90,12 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
int xscreen = DefaultScreen( xdisplay ); int xscreen = DefaultScreen( xdisplay );
Visual *xvisual = DefaultVisual( xdisplay, xscreen ); Visual *xvisual = DefaultVisual( xdisplay, xscreen );
Window xparent = RootWindow( 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; XSetWindowAttributes xattributes;
XSizeHints size_hints; XSizeHints size_hints;
XWMHints wm_hints; XWMHints wm_hints;
@@ -96,7 +103,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
long xattributes_mask = long xattributes_mask =
CWOverrideRedirect | CWOverrideRedirect |
CWBorderPixel | CWBackPixel; CWBorderPixel | CWBackPixel;
xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); xattributes.background_pixel = m_backgroundColour.GetPixel();
xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
xattributes.override_redirect = False; xattributes.override_redirect = False;

4
src/x11/window.cpp
View File

@@ -149,7 +149,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
xdisplay, parentWindow, xdisplay, parentWindow,
x, y, w, h, 0, x, y, w, h, 0,
m_backgroundColour.GetPixel(), m_backgroundColour.GetPixel(),
m_foregroundColour.GetPixel() ); m_backgroundColour.GetPixel() );
m_mainWidget = (WXWindow) window; m_mainWidget = (WXWindow) window;
@@ -956,7 +956,7 @@ void wxWindowX11::X11SendPaintEvents()
{ {
m_clipPaintRegion = TRUE; m_clipPaintRegion = TRUE;
if (!m_clearRegion.IsEmpty()) // if (!m_clearRegion.IsEmpty())
{ {
wxWindowDC dc( (wxWindow*)this ); wxWindowDC dc( (wxWindow*)this );
dc.SetClippingRegion( m_clearRegion ); dc.SetClippingRegion( m_clearRegion );