Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run fix for Lesstif

Browse Source 
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:
Robert Roebling
1998-12-04 13:12:12 +00:00
parent a367b9b3f8
commit 32c69f2cf9
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/make.env
View File

@@ -8,6 +8,7 @@
########################### Programs ################################# ########################### Programs #################################
# Replace this with your own path if necessary # Replace this with your own path if necessary
#WXDIR = /home/karl/wxWindows
WXDIR = /home/jacs/wx2 WXDIR = /home/jacs/wx2
# C++ compiler # C++ compiler

1
src/makeprog.env
View File

@@ -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 WXDIR = /home/jacs/wx2
include $(WXDIR)/src/make.env include $(WXDIR)/src/make.env

3
src/motif/dcscreen.cpp
View File

@@ -47,9 +47,10 @@ wxScreenDC::wxScreenDC()
gcvalues.foreground = BlackPixel (display, DefaultScreen (display)); gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
gcvalues.background = WhitePixel (display, DefaultScreen (display)); gcvalues.background = WhitePixel (display, DefaultScreen (display));
gcvalues.graphics_exposures = False; gcvalues.graphics_exposures = False;
gcvalues.subwindow_mode = IncludeInferiors;
gcvalues.line_width = 1; gcvalues.line_width = 1;
m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)), m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth, GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues); &gcvalues);
m_backgroundPixel = (int) gcvalues.background; m_backgroundPixel = (int) gcvalues.background;

3
src/motif/window.cpp
View File

@@ -3199,9 +3199,12 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
int width, height, width1, height1; int width, height, width1, height1;
GetSize(& width, & height); GetSize(& width, & height);
// lesstif 0.87 hangs here
#ifndef LESSTIF_VERSION
XtVaSetValues (w, XtVaSetValues (w,
XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)), XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
NULL); NULL);
#endif
GetSize(& width1, & height1); GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1)) if (keepOriginalSize && (width != width1 || height != height1))