use GetFont() instead of (possibly not initialized) m_font in GetCharWidth/Height()

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 3067215c262dd6e72e56e34c4f314315b8170117..ed4835ee07669754f2f67f21fd0b9b262546ebea 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -279,9 +279,9 @@ MAKEPRECOMP=/YcWX/WXPREC.H
 
 !if "$(DLL)" == "0"
 
 
 !if "$(DLL)" == "0"
 

-CPPFLAGS=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /GX- $(OVERRIDEFLAGS)
+CPPFLAGS=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) $(OVERRIDEFLAGS)

 # If you don't include wxprec.h, use CPPFLAGS2
 # If you don't include wxprec.h, use CPPFLAGS2

-CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /GX- $(OVERRIDEFLAGS)
+CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)

 
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)