From 227869da8d090e2364530dd310e2d63ad18edecf Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 25 Jan 1999 10:01:00 +0000 Subject: [PATCH] Fixed compile bug in proplist.cpp; added makevc.env git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/layout/layout.cpp | 4 +- samples/png/pngdemo.cpp | 8 +- src/generic/proplist.cpp | 6 +- src/makevc.env | 172 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 src/makevc.env diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index 8096c82b8f..e33b97fad9 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -171,8 +171,8 @@ END_EVENT_TABLE() void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) ) { - char *s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt"); - if (s) + wxString s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt"); + if (s != "") { #ifdef __WXMSW__ frame->text_window->LoadFile(s); diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp index 07d19ac4a5..be10ff0534 100644 --- a/samples/png/pngdemo.cpp +++ b/samples/png/pngdemo.cpp @@ -107,10 +107,10 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) { - char *f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL, + wxString f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL, "png", "PNG files (*.png)|*.png" ); - if (!f) return; + if (f == "") return; wxBitmap *backstore = new wxBitmap( 150, 150 ); @@ -135,10 +135,10 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event)) { // Show file selector. - char *f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png", + wxString f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png", "PNG files (*.png)|*.png"); - if (!f) + if (f == "") return; if ( g_TestBitmap ) diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp index 44fc728e4b..f78601ef00 100644 --- a/src/generic/proplist.cpp +++ b/src/generic/proplist.cpp @@ -1465,7 +1465,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v if (!view->GetValueText()) return; - char *s = wxFileSelector( + wxString s = wxFileSelector( m_filenameMessage.GetData(), wxPathOnly(property->GetValue().StringValue()), wxFileNameFromPath(property->GetValue().StringValue()), @@ -1473,9 +1473,9 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v m_filenameWildCard.GetData(), 0, parentWindow); - if (s) + if (s != "") { - property->GetValue() = wxString(s); + property->GetValue() = s; view->DisplayProperty(property); view->UpdatePropertyDisplayInList(property); view->OnPropertyChanged(property); diff --git a/src/makevc.env b/src/makevc.env new file mode 100644 index 0000000000..01d08574fd --- /dev/null +++ b/src/makevc.env @@ -0,0 +1,172 @@ +# +# File: ntwxwin.env +# Author: Ulrich Leodolter +# Created: Wed May 17 08:36:42 1995 +# Updated: +# +# MSVC++ 32-bit makefile include file +# +!include + +WIN95=1 + +!if "$(WIN95)" == "0" +# With 3.50, Win95 will use your existing icons to show smaller ones. +# With 4.0, you'll have to follow Win95 procedures for icons or you'll get the +# default Windows icon. +APPVER=3.50 +WINVERSION=-DWINVER=0x0350 # Generic WIN32 +!else +APPVER=3.50 # 4.0 +# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0). +WINVERSION=-DWINVER=0x0400 /D__WIN95__ +!endif + +# On Alpha machines, change to CPU=ALPHA +CPU=i386 + +# Suffixes +OBJSUFF=obj +SRCSUFF=cpp + +# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally +WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) +#WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER) +WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER) +#WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\ +# comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2 +WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\ + comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib # libci.lib # libci.lib required for VC++ 4.2 + +# Change this to your WXWIN directory +WXDIR=$(WXWIN) + +WXSRC=$(WXDIR)\src\msw +WXINC=$(WXDIR)\include +WXBASESRC=$(WXDIR)\src\common + +##################################################################### +# These are the possible DLL/non-DLL usages: +# +# Type _DLL/_WINDLL WXUSINGDLL WXMAKINGDLL Library +#-------------------------------------------------------------------- +# Normal application - - - wx.lib +# +# wxWin as DLL Defined - Defined wx200.lib +# +# App using wxWin DLL - Defined - wx200.lib +# +# App built as one DLL Defined - - wx.lib +# +###################################################################### +# +# Compiling your app: +#-------------------- +# when compiling an app to use the DLL version of wxWindows +# (but not to be a DLL itself), set WXUSINGDLL to 1 in your +# makefile just before including ntwxwin.mak. +# To compile wxWin _and_ app itself as a DLL, set DLL to 1 +# in ntwxwin.mak, and do not set WXUSINGDLL. +# +# Compiling wxWindows: +#--------------------- +# Use the dll target to compile wxWindows as DLL; then make 'pch' +# to generate a precompiled header for your apps to use. BUG: must compile without +# wxExpr (USE_WX_RESOURCES = 0) for this to link properly. Don't know why yet. +# Use the dllapp target to compile wxWindows for making a DLL app (not implemented yet) + +#DLL=0 + +!if "$(WXUSINGDLL)" == "1" || "$(WXMAKINGDLL)" == "1" +WXLIB=$(WXDIR)\lib\wx200.lib +!else +WXLIB=$(WXDIR)\lib\wx.lib +!endif + +!if "$(WXUSINGDLL)" == "1" +EXTRADLLFLAGS=/DWXUSINGDLL=1 +!endif + +!if "$(WXMAKINGDLL)" == "1" +EXTRADLLFLAGS=/DWXMAKINGDLL=1 +!endif + +!if "$(WXMAKINGDLL)" == "0" && "$(DLL)" == "1" +EXTRADLLFLAGS= +!endif + +!if "$(NOMAIN)" == "1" +EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN +!endif + +INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC) +LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib + +!ifndef FINAL +FINAL=0 +DEBUG=1 +!endif + +!ifndef DLL +DLL=0 +!endif + +# Set this to 1 if you don't want to use precompiled headers +!ifndef NOPCH +NOPCH=0 +!endif + +MAKEPRECOMP=/YcWX/WXPREC.H +OPTIONS= + +!if "$(FINAL)" == "0" +OPT = /Od /Gy +# ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated +DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR +LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE +CRTFLAG=/MD +!else +# /O1 - smallest code +# /O2 - fastest code +OPT = /O1 # /O2 # /Od +DEBUG_FLAGS= +LINK_DEBUG_FLAGS=/RELEASE +CRTFLAG=/MD +!endif + +!if "$(DLL)" == "0" + +!if "$(NOPCH)" == "1" +PCH= +PRECOMP= +MAKEPRECOMP= +!else +PCH=WX.PCH +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb +MAKEPRECOMP=/YcWX/WXPREC.H +!endif + +CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) +# If you don't include wxprec.h, use CPPFLAGS2 +CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) +LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup +DUMMY=dummy + +!else + +!if "$(WXMAKINGDLL)" == "1" +PCH=WXDLL.PCH +DUMMY=dummydll +!else +PCH=WX.PCH +DUMMY=dummy +!endif + +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb +CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL +CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL +LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY) +!endif + +DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj + -- 2.45.2