From b0126f60944520124c6ef8d2c5e60caf55d4266a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 13 Jun 2003 13:06:51 +0000 Subject: [PATCH] regenerated all make/project files to include selstore.cpp/.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/files.lst | 4 + src/gtk1/files.lst | 4 + src/mac/carbon/files.lst | 3 - src/mac/files.lst | 3 - src/mgl/files.lst | 3 + src/mgl/makefile.wat | 4 + src/microwin/files.lst | 3 + src/motif/files.lst | 3 + src/msw/files.lst | 5 +- src/msw/makefile.bcc | 6 ++ src/msw/makefile.dos | 12 +++ src/msw/makefile.g95 | 1 + src/msw/makefile.sc | 2 + src/msw/makefile.vc | 1 + src/msw/makefile.wat | 7 ++ src/wxUniv.dsp | 8 ++ src/wxWindows.dsp | 173 ++++++++++++++++++--------------------- src/x11/files.lst | 3 + 18 files changed, 143 insertions(+), 102 deletions(-) diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 359a021ad4..77e77ca154 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -32,6 +32,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -442,6 +443,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -797,6 +799,7 @@ GUIOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ @@ -904,6 +907,7 @@ GUI_LOWLEVEL_OBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 359a021ad4..77e77ca154 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -32,6 +32,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -442,6 +443,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -797,6 +799,7 @@ GUIOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ @@ -904,6 +907,7 @@ GUI_LOWLEVEL_OBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 2da155eea5..0ea69981c8 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -805,7 +805,6 @@ GENERICOBJS = \ gridctrl.o \ gridsel.o \ helpext.o \ - htmllbox.o \ imaglist.o \ laywin.o \ listctrl.o \ @@ -829,8 +828,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - vlbox.o \ - vscroll.o \ wizard.o GUIOBJS = \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 2da155eea5..0ea69981c8 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -805,7 +805,6 @@ GENERICOBJS = \ gridctrl.o \ gridsel.o \ helpext.o \ - htmllbox.o \ imaglist.o \ laywin.o \ listctrl.o \ @@ -829,8 +828,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - vlbox.o \ - vscroll.o \ wizard.o GUIOBJS = \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 144e894db8..0e6da580f2 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -32,6 +32,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -401,6 +402,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -717,6 +719,7 @@ GENERICOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 67141010f2..6e21f6df05 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -71,6 +71,7 @@ GENERICOBJS= accel.obj & progdlgg.obj & sashwin.obj & scrlwing.obj & + selstore.obj & spinctlg.obj & splash.obj & splitter.obj & @@ -1040,6 +1041,9 @@ sashwin.obj: $(GENDIR)\sashwin.cpp scrlwing.obj: $(GENDIR)\scrlwing.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +selstore.obj: $(GENDIR)\selstore.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + spinctlg.obj: $(GENDIR)\spinctlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index ed7428f662..ea3c481a7d 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -31,6 +31,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -401,6 +402,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -787,6 +789,7 @@ GENERICOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 91ad6317f6..1a2d781d57 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -31,6 +31,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -439,6 +440,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -792,6 +794,7 @@ GENERICOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index a80b758dc5..5d96537498 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -18,6 +18,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -267,8 +268,8 @@ ALL_SOURCES = \ msw/utils.cpp \ msw/utilsexc.cpp \ msw/ole/uuid.cpp \ - msw/volume.cpp \ msw/uxtheme.cpp \ + msw/volume.cpp \ msw/wave.cpp \ msw/window.cpp \ html/helpctrl.cpp \ @@ -464,6 +465,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -845,6 +847,7 @@ GENERICOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 82934e0aa4..3798ba4eba 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -89,6 +89,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\progdlgg.obj \ $(MSWDIR)\sashwin.obj \ $(MSWDIR)\scrlwing.obj \ + $(MSWDIR)\selstore.obj \ $(MSWDIR)\spinctlg.obj \ $(MSWDIR)\splash.obj \ $(MSWDIR)\splitter.obj \ @@ -299,6 +300,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\toplevel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj @@ -487,6 +489,8 @@ $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) +$(MSWDIR)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF) + $(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) @@ -778,6 +782,8 @@ $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) $(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) +$(MSWDIR)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF) + $(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) $(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 85f0732c67..dfdea5d891 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -72,6 +72,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\progdlgg.obj \ $(GENDIR)\sashwin.obj \ $(GENDIR)\scrlwing.obj \ + $(GENDIR)\selstore.obj \ $(GENDIR)\spinctlg.obj \ $(GENDIR)\splash.obj \ $(GENDIR)\splitter.obj \ @@ -287,6 +288,7 @@ MSWOBJS2 = $(MSWDIR)\palette.obj \ $(MSWDIR)\toplevel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ + $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj @@ -772,6 +774,11 @@ $(MSWDIR)/utilsexc.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/uxtheme.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/volume.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1472,6 +1479,11 @@ $(GENDIR)/scrlwing.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(GENDIR)/selstore.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(GENDIR)/spinctlg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index bfdf552f88..2199dd6b5b 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -94,6 +94,7 @@ GENERICOBJS = \ $(GENDIR)/progdlgg.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ $(GENDIR)/scrlwing.$(OBJSUFF) \ + $(GENDIR)/selstore.$(OBJSUFF) \ $(GENDIR)/spinctlg.$(OBJSUFF) \ $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index b69656843c..2a967cffc8 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -45,6 +45,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\progdlgg.obj \ $(GENDIR)\sashwin.obj \ $(GENDIR)\scrlwing.obj \ + $(GENDIR)\selstore.obj \ $(GENDIR)\spinctlg.obj \ $(GENDIR)\splash.obj \ $(GENDIR)\splitter.obj \ @@ -317,6 +318,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ $(MSWDIR)\ole\uuid.obj \ + $(MSWDIR)\uxtheme.obj \ $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index d6ae792e65..a7ac76192e 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -105,6 +105,7 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\progdlgg.obj \ $(GENDIR)\$D\sashwin.obj \ $(GENDIR)\$D\scrlwing.obj \ + $(GENDIR)\$D\selstore.obj \ $(GENDIR)\$D\spinctlg.obj \ $(GENDIR)\$D\splash.obj \ $(GENDIR)\$D\splitter.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 97285fd859..76fd300005 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -42,6 +42,7 @@ GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj & $(OUTPUTDIR)\progdlgg.obj & $(OUTPUTDIR)\sashwin.obj & $(OUTPUTDIR)\scrlwing.obj & + $(OUTPUTDIR)\selstore.obj & $(OUTPUTDIR)\spinctlg.obj & $(OUTPUTDIR)\splash.obj & $(OUTPUTDIR)\splitter.obj & @@ -697,6 +698,9 @@ $(OUTPUTDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.cpp $(OUTPUTDIR)\uuid.obj: $(OLEDIR)\uuid.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\uxtheme.obj: $(MSWDIR)\uxtheme.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\volume.obj: $(MSWDIR)\volume.cpp *$(CXX) $(CXXFLAGS) $< @@ -1165,6 +1169,9 @@ $(OUTPUTDIR)\sashwin.obj: $(GENDIR)\sashwin.cpp $(OUTPUTDIR)\scrlwing.obj: $(GENDIR)\scrlwing.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\selstore.obj: $(GENDIR)\selstore.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\spinctlg.obj: $(GENDIR)\spinctlg.cpp *$(CXX) $(CXXFLAGS) $< diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index b6d098b94f..2211badf89 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -741,6 +741,10 @@ SOURCE=.\generic\scrlwing.cpp # End Source File # Begin Source File +SOURCE=.\generic\selstore.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\spinctlg.cpp # End Source File # Begin Source File @@ -1995,6 +1999,10 @@ SOURCE=..\include\wx\scrolwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\selstore.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\settings.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index b96d4eb66a..68faeb3729 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2,8 +2,8 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=wxWindows - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -32,6 +32,8 @@ CFG=wxWindows - Win32 Debug # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" @@ -46,13 +48,10 @@ CFG=wxWindows - Win32 Debug # PROP Intermediate_Dir "../ReleaseUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -75,20 +74,17 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept +# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -103,10 +99,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../ReleaseUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -128,10 +122,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../DebugUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -154,13 +146,10 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "../ReleaseDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -183,20 +172,17 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept +# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -211,10 +197,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Release" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -236,10 +220,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -410,11 +392,6 @@ SOURCE=.\common\event.cpp # End Source File # Begin Source File -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\fddlgcmn.cpp # End Source File # Begin Source File @@ -743,11 +720,6 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -794,6 +766,18 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File + +# Begin Source File + +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + # End Group # Begin Group "Generic Files" @@ -868,6 +852,10 @@ SOURCE=.\generic\scrlwing.cpp # End Source File # Begin Source File +SOURCE=.\generic\selstore.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\spinctlg.cpp # End Source File # Begin Source File @@ -906,6 +894,7 @@ SOURCE=.\generic\treectlg.cpp SOURCE=.\generic\wizard.cpp # End Source File + # End Group # Begin Group "wxHTML Files" @@ -990,42 +979,16 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File + # End Group # Begin Group "MSW Files" # PROP Default_Filter "" -# Begin Group "OLE Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\msw\ole\access.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\automtn.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\dataobj.cpp -# End Source File # Begin Source File -SOURCE=.\msw\ole\dropsrc.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\droptgt.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\oleutils.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\uuid.cpp +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" # End Source File -# End Group # Begin Source File SOURCE=.\msw\accel.cpp @@ -1148,11 +1111,6 @@ SOURCE=.\msw\dragimag.cpp # End Source File # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\msw\enhmeta.cpp # End Source File # Begin Source File @@ -1205,16 +1163,6 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1449,6 +1397,51 @@ SOURCE=.\msw\wave.cpp SOURCE=.\msw\window.cpp # End Source File + +# Begin Source File + +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + +# Begin Group "OLE Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\msw\ole\access.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\automtn.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dropsrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\oleutils.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\uuid.cpp +# End Source File + +# End Group # End Group # Begin Group "Headers" @@ -1459,9 +1452,7 @@ SOURCE=.\msw\window.cpp # Begin Source File SOURCE=..\include\wx\msw\setup.h - !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" - # Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1469,9 +1460,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" - # Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1479,9 +1468,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" - # Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1489,9 +1476,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" - # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1499,9 +1484,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" - # Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1509,9 +1492,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" - # Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1519,9 +1500,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" - # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1529,9 +1508,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" - # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1539,9 +1516,7 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build - !ENDIF - # End Source File # End Group # Begin Group "Common" @@ -2225,6 +2200,10 @@ SOURCE=..\include\wx\scrolwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\selstore.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\settings.h # End Source File # Begin Source File @@ -2479,6 +2458,7 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File + # End Group # Begin Group "MSW" @@ -2847,6 +2827,7 @@ SOURCE=..\include\wx\msw\window.h SOURCE=..\include\wx\msw\winundef.h # End Source File + # End Group # Begin Group "Generic" @@ -3007,6 +2988,7 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File + # End Group # Begin Group "HTML" @@ -3063,6 +3045,7 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File + # End Group # End Group # End Target diff --git a/src/x11/files.lst b/src/x11/files.lst index a7d9c25cf2..809074b21f 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -64,6 +64,7 @@ ALL_SOURCES = \ generic/progdlgg.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ + generic/selstore.cpp \ generic/spinctlg.cpp \ generic/splash.cpp \ generic/splitter.cpp \ @@ -412,6 +413,7 @@ ALL_HEADERS = \ sckstrm.h \ scrolbar.h \ scrolwin.h \ + selstore.h \ settings.h \ sizer.h \ slider.h \ @@ -810,6 +812,7 @@ GENERICOBJS = \ progdlgg.o \ sashwin.o \ scrlwing.o \ + selstore.o \ spinctlg.o \ splash.o \ splitter.o \ -- 2.45.2