Various compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index c32af380e28ca6311367ffdb1744a1a141848e3f..c6acdd5eb82fd5990d01c59c552a74372682dea3 100644 (file)
--- 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 d5514db7b98d2cf94516d401b7d8350711d8f4eb..354007c3720ebe284d055462b433bfe8b9a30b18 100644 (file)
--- 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 8dd6adbc61cd676e6ee55e72e5bc47a79e4cf4d5..9294a5d7e212db1c7cce2d4207856999c8e1bfdb 100644 (file)
--- 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 59b2ee7479f37aa69cd4688a976a62a14ee907ff..9c7086524dde4efb4f77d6b7b32a595c1a175501 100644 (file)
--- 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 d20a6b91909440548df888d822abbb8c37b4d79d..5e15ddd3a2c24b3aac40f6f450dcf00e134e2bba 100644 (file)
--- 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(),