From: Julian Smart Date: Tue, 9 Apr 2002 14:40:22 +0000 (+0000) Subject: Removed redundant project file X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/171fe25be9beecc2ed41faa71e2871458096c718?ds=sidebyside Removed redundant project file Updated release scripts Reduced widgets sample size Put back some conditional compilation for dir ctrl style git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt index c7dd8c3b7b..473ec39de1 100644 --- a/distrib/msw/innobott.txt +++ b/distrib/msw/innobott.txt @@ -1,17 +1,16 @@ [Icons] Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0 - Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths + Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0 - Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths + Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0 Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\wxWindows Help; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\HTML Docs Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths - -; Name: {group}\Life! Demo; Filename: {app}\bin\life.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\life.exe; IconIndex: 0 + Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0 [INI] diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 34e717db32..56dc955443 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -22,8 +22,8 @@ src/regex/regex.dsw samples/samples.dsw -samples/artprov/arttest.dsp -samples/artprov/arttest.dsw +samples/artprov/artprov.dsp +samples/artprov/artprov.dsw samples/calendar/arttest.dsp samples/calendar/arttest.dsw diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index 62eab13e53..80e0910203 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -223,10 +223,11 @@ if not isdir bin mkdir bin copy %src\bin\dialoged.exe bin copy %src\bin\tex2rtf.exe bin copy %src\bin\dbgview.* bin -copy %src\bin\life.exe bin -copy %src\demos\life\breeder.lif bin -copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin -copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin +copy %src\bin\widgets.exe bin +copy %src\bin\widgets.exe.manifest bin +Rem copy %src\demos\life\breeder.lif bin +copy %src\docs\htmlhelp\dialoged.chm bin +copy %src\docs\htmlhelp\tex2rtf.chm bin Rem Make wxMSW-xxx.zip zip32 -r ..\wxMSW-%version%.zip * diff --git a/samples/artprov/arttest.dsp b/samples/artprov/arttest.dsp deleted file mode 100644 index c776958931..0000000000 --- a/samples/artprov/arttest.dsp +++ /dev/null @@ -1,158 +0,0 @@ -# Microsoft Developer Studio Project File - Name="arttest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=arttest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "arttest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "arttest.mak" CFG="arttest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "arttest - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE "arttest - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "arttest - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "arttest - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!ELSEIF "$(CFG)" == "arttest - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseDll" -# PROP BASE Intermediate_Dir "ReleaseDll" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c -# ADD CPP /nologo /W4 /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /D WXUSINGDLL /I..\..\lib\mswdll -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../include" -# ADD RSC /l 0x409 /d "NDEBUG" /I "../../include" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.lib - -!ELSEIF "$(CFG)" == "arttest - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DebugDll" -# PROP BASE Intermediate_Dir "DebugDll" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c -# ADD CPP /nologo /W4 /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /D WXUSINGDLL /I..\..\lib\mswdlld -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../include" -# ADD RSC /l 0x409 /d "_DEBUG" /I "../../include" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.lib - -!ELSEIF "$(CFG)" == "arttest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c -# ADD CPP /nologo /W4 /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD /I..\..\lib\msw -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "../../include" -# ADD RSC /l 0x409 /d "NDEBUG" /I "../../include" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib - -!ELSEIF "$(CFG)" == "arttest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c -# ADD CPP /nologo /W4 /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1" /I..\..\lib\mswd -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "../../include" -# ADD RSC /l 0x409 /d "_DEBUG" /I "../../include" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib - -!ENDIF - -# Begin Target - -# Name "arttest - Win32 Release DLL" -# Name "arttest - Win32 Debug DLL" -# Name "arttest - Win32 Release" -# Name "arttest - Win32 Debug" -# Begin Source File - -SOURCE=.\arttest.cpp -# End Source File -# Begin Source File - -SOURCE=.\artbrows.cpp -# End Source File -# Begin Source File - -SOURCE=.\arttest.rc -# End Source File -# End Target -# End Project diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 70385cff71..8a2826f55a 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -504,8 +504,10 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, long treeStyle = wxTR_HAS_BUTTONS; +#ifdef __WXMSW__ if (style & wxDIRCTRL_EDITABLE) treeStyle |= wxTR_EDIT_LABELS; +#endif #ifndef __WXMSW__ // FIXME, doesn't work for some reason