projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get/SetTitle only for wxTopLevelWindow (wxX11 part, final)
[wxWidgets.git]
/
src
/
x11
/
popupwin.cpp
diff --git
a/src/x11/popupwin.cpp
b/src/x11/popupwin.cpp
index a9b07ccaab2b925e94306685bc80153c0349cc9b..45b3a278c6a15d35758b98a6a634cb3d98665cf1 100644
(file)
--- a/
src/x11/popupwin.cpp
+++ b/
src/x11/popupwin.cpp
@@
-4,14
+4,11
@@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "popupwin.h"
-#endif
-
#include "wx/defs.h"
#include "wx/defs.h"
+#include "wx/log.h"
#if wxUSE_POPUPWIN
#if wxUSE_POPUPWIN
@@
-30,7
+27,9
@@
BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
+wxPopupWindow::~wxPopupWindow()
+{
+}
bool wxPopupWindow::Create( wxWindow *parent, int style )
{
bool wxPopupWindow::Create( wxWindow *parent, int style )
{
@@
-56,6
+55,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 =
@@
-70,6
+70,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();