More configure/compile things for X11.

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

diff --git a/configure b/configure
index 85d18186d66371c5b9f1cd418ad5d40075a70850..5b1884f49f9a1cd24238746939d619f79c7c7a47 100755 (executable)
--- a/configure
+++ b/configure
@@ -12183,10 +12183,10 @@ rm -f conftest*
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"

-        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"

         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLKIT=X11
         GUIDIST=X11_DIST

-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXX11__"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"

     fi
 
     if test "$wxUSE_WINE" = 1; then
     fi
 
     if test "$wxUSE_WINE" = 1; then

diff --git a/configure.in b/configure.in
index 1b92336217cb4310ef88502439879a07f83548a3..cea0d9ecfb700dcc1693b8f5e916ac9988727342 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1882,10 +1882,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
         fi
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"

-        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"

         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLKIT=X11
         GUIDIST=X11_DIST

-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXX11__"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"

     fi
 
     if test "$wxUSE_WINE" = 1; then
     fi
 
     if test "$wxUSE_WINE" = 1; then

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 8dcdd17c7a480275ee3495206b19b2e3729c08c4..be70734bf3d5c3385562cea5e9d94d5dfc1cadbd 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -43,7 +43,9 @@
 
 // Set the window manager decorations according to the
 // given wxWindows style
 
 // Set the window manager decorations according to the
 // given wxWindows style

+#if 0

 static bool SetWMDecorations(Widget w, long style);
 static bool SetWMDecorations(Widget w, long style);

+#endif

 static bool MWMIsRunning(Window w);
 
 
 static bool MWMIsRunning(Window w);
 
 


@@ -110,7 +112,9 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", False);
 
     XSetWMProtocols(wxGlobalDisplay(), (Window) GetMainWindow(), &wm_delete_window, 1);
     Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", False);
 
     XSetWMProtocols(wxGlobalDisplay(), (Window) GetMainWindow(), &wm_delete_window, 1);

+#if 0

     SetWMDecorations((Window) GetMainWindow(), style);
     SetWMDecorations((Window) GetMainWindow(), style);

+#endif

 
     SetTitle(title);
 
 
     SetTitle(title);
 


@@ -237,6 +241,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
 
     if (icon.Ok() && GetMainWindow())
     {
 
     if (icon.Ok() && GetMainWindow())
     {

+#if 0

         XWMHints *wmHints = XAllocWMHints();
         wmHints.icon_pixmap = (Pixmap) icon.GetPixmap();
 
         XWMHints *wmHints = XAllocWMHints();
         wmHints.icon_pixmap = (Pixmap) icon.GetPixmap();
 


@@ -251,6 +256,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
         XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
             wmHints);
         XFree(wmHints);
         XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
             wmHints);
         XFree(wmHints);

+#endif

     }
 }
 
     }
 }
 


@@ -308,6 +314,7 @@ struct MwmHints {
 
 // Set the window manager decorations according to the
 // given wxWindows style
 
 // Set the window manager decorations according to the
 // given wxWindows style

+#if 0

 static bool SetWMDecorations(Widget w, long style)
 {
     if (!MWMIsRunning(w))
 static bool SetWMDecorations(Widget w, long style)
 {
     if (!MWMIsRunning(w))


@@ -370,21 +377,25 @@ static bool SetWMDecorations(Widget w, long style)
 
     return TRUE;
 }
 
     return TRUE;
 }

+#endif

 
 static bool MWMIsRunning(Window w)
 {
 
 static bool MWMIsRunning(Window w)
 {

+    Display *dpy = (Display*)wxGetDisplay();

     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
 
     unsigned long length, bytesafter;
     unsigned char value[20];
     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
 
     unsigned long length, bytesafter;
     unsigned char value[20];

-    int ret, type, format;
+    unsigned char *ptr = &value[0];
+    int ret, format;
+    Atom type;

 
     type = format = length = 0;
 
     type = format = length = 0;

-    value = 0;
+    value[0] = 0;

 
     ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
            0L, 2, False, motifWmInfo, 
 
     ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
            0L, 2, False, motifWmInfo, 

-           &type, &format, &length, &bytesafter, &value);
+           &type, &format, &length, &bytesafter, &ptr);

 
     return (ret == Success);
 }
 
     return (ret == Success);
 }