Linking now

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

diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index 4ef2f1f0d5a85e4dca064def906be732d0ffffae..4d8e8ac9dc10a535d01af9d4c255eadd680d9609 100644 (file)
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -43,7 +43,7 @@ COMPILING USING CONFIGURE
 If you compile wxWindows on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
 
-> ./configure --with-x11 --with-universal
+> ./configure --with-x11
 > make
 > su <type root password>
 > make install

diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt
index 0835381fdff1aabb5501607469a5520e5a556266..5c49da7398715ec2fcd3bfc6fdb84145cb5ff894 100644 (file)
--- a/docs/x11/readme.txt
+++ b/docs/x11/readme.txt
@@ -16,7 +16,8 @@ Information on how to install can be found in the file
 install.txt, but if you cannot wait, this should work on
 many systems:
 
-./configure --with-x11 --with-universal
+./configure --with-x11 --disable-shared --with-x11 --with-debug_flag --enable-log --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -with-libjpeg --enable-debug_cntxt --disable-no_rtti"
+
 make
 su <type root password>
 make install

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index e5eb0633d15f529001e64ff56c4614b1671f6553..5ba383e3c3bad835251e24fc97dc35fa47870145 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -35,7 +35,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     #include "mondrian.xpm"
 #endif
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 97d84b676c5b03343d317aba96c4fe742330ecb3..c81e168b15543781043b5b90193dcae1519afbb9 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -728,6 +728,8 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     info = CLASSINFO(wxWindowMSW);
 #  elif defined(__WXGTK__)
     info = CLASSINFO(wxWindowGTK);
+#  elif defined(__WXX11__)
+    info = CLASSINFO(wxWindowX11);
 #  elif defined(__WXMGL__)
     info = CLASSINFO(wxWindowMGL);
 #  elif defined(__WXPM__)

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index b1e8fa532b381f2f20664e81ca1620b68e0737a2..d011651a88277077e9c034f12cf95113b5f7c6b6 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -598,6 +598,9 @@ void wxApp::DeletePendingObjects()
 // Create an application context
 bool wxApp::OnInitGui()
 {
+    if (!wxAppBase::OnInitGui())
+       return FALSE;
+    
     // TODO: parse argv and get display to pass to XOpenDisplay
     Display* dpy = XOpenDisplay(NULL);
     m_initialDisplay = (WXDisplay*) dpy;
@@ -643,8 +646,12 @@ Window wxGetWindowParent(Window window)
 {
     Window parent, root = 0;
     unsigned int noChildren = 0;
-    if (XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
-        NULL, & noChildren))
+    Window* children = NULL;
+    int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
+                        & children, & noChildren);
+    if (children)
+        XFree(children);
+    if (res)
         return parent;
     else
         return (Window) 0;

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 9294a5d7e212db1c7cce2d4207856999c8e1bfdb..e442728bde0ba673db7aca108bcb68ee018ba9da 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -61,7 +61,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     XWMHints wm_hints;
     
     long xattributes_mask =
-        CWEventMask |
+        CWOverrideRedirect |
         CWBorderPixel | CWBackPixel;
     xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 9c7086524dde4efb4f77d6b7b32a595c1a175501..c8e8b8f4a8c30e9b07cd13e74207c99e018093eb 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -93,7 +93,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     XWMHints wm_hints;
     
     long xattributes_mask =
-        CWEventMask |
+        CWOverrideRedirect |
         CWBorderPixel | CWBackPixel;
     xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 5e15ddd3a2c24b3aac40f6f450dcf00e134e2bba..6914ada32d9eeda9698af0d6dd33b4a4cd55966e 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -147,7 +147,8 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow,
         x, y, w, h, 0,
         m_backgroundColour.AllocColour(wxGlobalDisplay()),
-        m_foregroundColour.AllocColour(wxGlobalDisplay()));
+                                       m_foregroundColour.AllocColour(wxGlobalDisplay()));
+    m_mainWidget = (WXWindow) window;
 
     // Select event types wanted
     XSelectInput(wxGlobalDisplay(), window,