From 32c69f2cf986c3ebea3ca421ce7322773eb647b8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 4 Dec 1998 13:12:12 +0000 Subject: [PATCH] Run fix for Lesstif wxScreenDC works better now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/make.env | 1 + src/makeprog.env | 1 + src/motif/dcscreen.cpp | 3 ++- src/motif/window.cpp | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/make.env b/src/make.env index 571f730386..d618b07d3c 100644 --- a/src/make.env +++ b/src/make.env @@ -8,6 +8,7 @@ ########################### Programs ################################# # Replace this with your own path if necessary +#WXDIR = /home/karl/wxWindows WXDIR = /home/jacs/wx2 # C++ compiler diff --git a/src/makeprog.env b/src/makeprog.env index 8f3c8ad371..49b5de907f 100644 --- a/src/makeprog.env +++ b/src/makeprog.env @@ -1,4 +1,5 @@ # Replace this with your own path if necessary +#WXDIR = /home/karl/wxWindows WXDIR = /home/jacs/wx2 include $(WXDIR)/src/make.env diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp index ac4344498e..2f5d52453b 100644 --- a/src/motif/dcscreen.cpp +++ b/src/motif/dcscreen.cpp @@ -47,9 +47,10 @@ wxScreenDC::wxScreenDC() gcvalues.foreground = BlackPixel (display, DefaultScreen (display)); gcvalues.background = WhitePixel (display, DefaultScreen (display)); gcvalues.graphics_exposures = False; + gcvalues.subwindow_mode = IncludeInferiors; gcvalues.line_width = 1; m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)), - GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth, + GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode, &gcvalues); m_backgroundPixel = (int) gcvalues.background; diff --git a/src/motif/window.cpp b/src/motif/window.cpp index d0fb59376a..d6bef2d967 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -3199,9 +3199,12 @@ void wxWindow::ChangeFont(bool keepOriginalSize) int width, height, width1, height1; GetSize(& width, & height); +// lesstif 0.87 hangs here +#ifndef LESSTIF_VERSION XtVaSetValues (w, XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)), NULL); +#endif GetSize(& width1, & height1); if (keepOriginalSize && (width != width1 || height != height1)) -- 2.49.0