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

Must have valid colours for X11 popup window implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-05-25 20:41:54 +00:00
parent 3fe1edc244
commit 6033bbc1ff
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/x11/popupwin.h
View File

@@ -27,7 +27,7 @@ class wxPopupWindow: public wxPopupWindowBase
{ {
public: public:
wxPopupWindow() { } wxPopupWindow() { }
virtual ~wxPopupWindow() { } virtual ~wxPopupWindow() ;
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
{ (void)Create(parent, flags); } { (void)Create(parent, flags); }

4
src/x11/dcclient.cpp
View File

@@ -266,6 +266,9 @@ void wxWindowDC::SetUpDC()
m_backgroundBrush.GetColour().CalcPixel( m_cmap ); m_backgroundBrush.GetColour().CalcPixel( m_cmap );
unsigned long bg_col = m_backgroundBrush.GetColour().GetPixel(); unsigned long bg_col = m_backgroundBrush.GetColour().GetPixel();
m_textForegroundColour = *wxBLACK;
m_textBackgroundColour = *wxWHITE;
/* m_textGC */ /* m_textGC */
m_textForegroundColour.CalcPixel( m_cmap ); m_textForegroundColour.CalcPixel( m_cmap );
XSetForeground( (Display*) m_display, (GC) m_textGC, m_textForegroundColour.GetPixel() ); XSetForeground( (Display*) m_display, (GC) m_textGC, m_textForegroundColour.GetPixel() );
@@ -1554,6 +1557,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
cx = overall_return.width; cx = overall_return.width;
cy = ascent + descent; cy = ascent + descent;
m_textBackgroundColour.CalcPixel(m_cmap); m_textBackgroundColour.CalcPixel(m_cmap);
m_textForegroundColour.CalcPixel(m_cmap);
XSetForeground ((Display*) m_display, (GC) m_textGC, m_textBackgroundColour.GetPixel()); XSetForeground ((Display*) m_display, (GC) m_textGC, m_textBackgroundColour.GetPixel());
XFillRectangle( (Display*) m_display, (Window) m_window, XFillRectangle( (Display*) m_display, (Window) m_window,
(GC) m_textGC, x, y, cx, cy ); (GC) m_textGC, x, y, cx, cy );

12
src/x11/popupwin.cpp
View File

@@ -12,6 +12,7 @@
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/log.h"
#if wxUSE_POPUPWIN #if wxUSE_POPUPWIN
@@ -32,6 +33,10 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
wxPopupWindow::~wxPopupWindow()
{
}
bool wxPopupWindow::Create( wxWindow *parent, int style ) bool wxPopupWindow::Create( wxWindow *parent, int style )
{ {
if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") )) if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
@@ -56,6 +61,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
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);
#if wxUSE_TWO_WINDOWS #if wxUSE_TWO_WINDOWS
bool need_two_windows = bool need_two_windows =
@@ -71,6 +77,12 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
XSetWindowAttributes xattributes; XSetWindowAttributes xattributes;
long xattributes_mask = 0; long xattributes_mask = 0;
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_backgroundColour.CalcPixel( (WXColormap) cm);
m_foregroundColour = *wxBLACK;
m_foregroundColour.CalcPixel( (WXColormap) cm);
xattributes_mask |= CWBackPixel; xattributes_mask |= CWBackPixel;
xattributes.background_pixel = m_backgroundColour.GetPixel(); xattributes.background_pixel = m_backgroundColour.GetPixel();