recall initial font

[wxWidgets.git] / src / x11 / popupwin.cpp

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 2fbf352a72de1265a437ebc200d4c645ddab1d70..34d95b1f2c880fb8caa68f6d7e901a7d87cba62c 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -7,16 +7,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "popupwin.h"
 #endif
 
 #include "wx/defs.h"
 #pragma implementation "popupwin.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/log.h"

 
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
 #include "wx/app.h"
 
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
 #include "wx/app.h"

+#include "wx/settings.h"

 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"


@@ -31,9 +33,13 @@ 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, "popup" ))
+    if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))

     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
         return FALSE;
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
         return FALSE;


@@ -55,6 +61,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );

+    Colormap cm = DefaultColormap( xdisplay, xscreen);

     
 #if wxUSE_TWO_WINDOWS
     bool need_two_windows = 
     
 #if wxUSE_TWO_WINDOWS
     bool need_two_windows = 


@@ -69,6 +76,12 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     
     XSetWindowAttributes xattributes;
     long xattributes_mask = 0;
     
     XSetWindowAttributes xattributes;
     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.background_pixel = m_backgroundColour.GetPixel();
     
     xattributes_mask |= CWBackPixel;
     xattributes.background_pixel = m_backgroundColour.GetPixel();