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

diff --git a/src/make.env b/src/make.env
index 571f7303868550b4b13da868d221c20c322ccd0d..d618b07d3cba6a89d180c9656d2ebb7dd735eb29 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -8,6 +8,7 @@
 ########################### Programs #################################
 
 # Replace this with your own path if necessary
 ########################### Programs #################################
 
 # Replace this with your own path if necessary

+#WXDIR       = /home/karl/wxWindows

 WXDIR       = /home/jacs/wx2
 
 # C++ compiler
 WXDIR       = /home/jacs/wx2
 
 # C++ compiler

diff --git a/src/makeprog.env b/src/makeprog.env
index 8f3c8ad37149c2bc622ebb155bf42978b35762e8..49b5de907fe324f01cbe5d7b4de60f45bc368755 100644 (file)
--- a/src/makeprog.env
+++ b/src/makeprog.env
@@ -1,4 +1,5 @@
 # Replace this with your own path if necessary
 # Replace this with your own path if necessary

+#WXDIR       = /home/karl/wxWindows

 WXDIR       = /home/jacs/wx2
 include $(WXDIR)/src/make.env
 
 WXDIR       = /home/jacs/wx2
 include $(WXDIR)/src/make.env
 

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index ac4344498e89d4c4864cf6af54753ab01a2959f8..2f5d52453b63eac07782c27101e69d63100f211f 100644 (file)
--- 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.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)),
   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;
                  &gcvalues);
 
   m_backgroundPixel = (int) gcvalues.background;

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index d0fb59376a854723054fcdfcff7adf4b6466abe7..d6bef2d967106d7c550871cd45f7dbc9b4366a60 100644 (file)
--- 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);
 
         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);
         XtVaSetValues (w,
                   XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
                   NULL);

+#endif

 
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
 
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))