Linking now

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

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

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

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
 

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__)

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;

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 );

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 );

src/x11/window.cpp

@@ -148,6 +148,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
         x, y, w, h, 0,
         m_backgroundColour.AllocColour(wxGlobalDisplay()),
 					m_foregroundColour.AllocColour(wxGlobalDisplay()));
+    m_mainWidget = (WXWindow) window;
 
     // Select event types wanted
     XSelectInput(wxGlobalDisplay(), window,