From 1b0b798d77b7b93b81d62162b290441bc9175e3e Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Mon, 11 Feb 2002 12:04:35 +0000
Subject: [PATCH]   Various compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/univ/window.h | 2 ++
 include/wx/x11/private.h | 2 ++
 src/x11/popupwin.cpp     | 3 +++
 src/x11/toplevel.cpp     | 9 +++------
 src/x11/window.cpp       | 7 ++++++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index c32af380e2..c6acdd5eb8 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -61,6 +61,8 @@ enum
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL
+#elif defined(__WXX11__)
+#define wxWindowNative wxWindowX11
 #elif defined(__WXMAC__)
 #define wxWindowNative wxWindowMac
 #endif
diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h
index d5514db7b9..354007c372 100644
--- a/include/wx/x11/private.h
+++ b/include/wx/x11/private.h
@@ -15,6 +15,8 @@
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "X11/Xlib.h"
+#include "X11/Xatom.h"
+#include "X11/Xutil.h"
 
 class wxMouseEvent;
 class wxKeyEvent;
diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 8dd6adbc61..9294a5d7e2 100644
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -42,6 +42,9 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     // All dialogs should really have this style
     m_windowStyle = style;
     m_windowStyle |= wxTAB_TRAVERSAL;
+    
+    wxPoint pos( 20,20 );
+    wxSize size( 20,20 );
 
     m_parent = parent;
     if (m_parent) m_parent->AddChild( this );
diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 59b2ee7479..9c7086524d 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -38,11 +38,9 @@
 #endif //WX_PRECOMP
 
 #include "wx/x11/private.h"
-#include "X11/Xatom.h"
-#include "X11/Xutil.h"
 
-// list of all frames and modeless dialogs
-// wxWindowList wxModelessWindows;
+
+bool wxMWMIsRunning(Window w);
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation
@@ -256,8 +254,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
         }
 
-        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
-            wmHints);
+        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
         XFree(wmHints);
     }
 }
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index d20a6b9190..5e15ddd3a2 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -325,7 +325,11 @@ void wxWindowX11::DoCaptureMouse()
         }
 
         res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
+#if 0
+            ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
+#else
             FALSE,
+#endif
             GrabModeAsync,
 	        GrabModeAsync,
             CurrentTime);
@@ -1309,8 +1313,9 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
     if (!GetMainWindow())
         return FALSE;
 
+    wxColour colour( col );
     XSetWindowAttributes attrib;
-    attrib.background_pixel = ((wxColour&)col).AllocColour(wxGlobalDisplay());
+    attrib.background_pixel = colour.AllocColour(wxGlobalDisplay());
 
     XChangeWindowAttributes(wxGlobalDisplay(),
         (Window) GetMainWindow(),