new bitmap creation code for mac

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 2a22dcb0b2dce4bf2b8968b9f4e753951e8dad0a..5633dae559782b67e90ac0a99f1f2c34049ca1ed 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -92,8 +92,10 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     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);
+    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+        m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+    else
+        m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     m_hasBgCol = TRUE;
        
@@ -128,6 +130,9 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     m_mainWidget = (WXWindow) xwindow;
 
     XSelectInput( xdisplay, xwindow,
+#if wxUSE_NANOX
+        GR_EVENT_MASK_CLOSE_REQ |
+#endif
         ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
         ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
         KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |