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
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
########################### Programs #################################
|
||||
|
||||
# Replace this with your own path if necessary
|
||||
#WXDIR = /home/karl/wxWindows
|
||||
WXDIR = /home/jacs/wx2
|
||||
|
||||
# C++ compiler
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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))
|
||||
|
Reference in New Issue
Block a user