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

Added "metal" theme.

Browse Source 
Added bool param to wxUniv indicating if the controls
   takes its background from the parent (such as
   static texts, radio buttons etc).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-04-10 20:38:15 +00:00
parent 7de5bdf4b3
commit 67d947ba89
17 changed files with 4691 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/tmake/filelist.txt
View File

@@ -410,6 +410,7 @@ theme.cpp Univ
gtk.cpp Univ Theme
winuniv.cpp Univ
win32.cpp Univ Theme
metal.cpp Univ Theme
gsockgtk.c GTK LowLevel
win_gtk.c GTK LowLevel

7
include/wx/univ/window.h
View File

@@ -200,6 +200,9 @@ public:
// erase part of the control
virtual void EraseBackground(wxDC& dc, const wxRect& rect);
// see below
bool HasDialogBackground() { return m_hasDialogBackground; }
// overridden base class methods
// -----------------------------
@@ -266,6 +269,10 @@ protected:
// the renderer we use
wxRenderer *m_renderer;
// background like a dialog (e.g. wxStaticText,
// wxRadioButton), not with a surface (wxButton)
bool m_hasDialogBackground;
// background bitmap info
wxBitmap m_bitmapBg;

8
src/mgl/makefile.wat
View File

@@ -150,6 +150,7 @@ COMMONOBJS = &
imagall.obj &
imagbmp.obj &
image.obj &
imagfill.obj &
imaggif.obj &
imagiff.obj &
imagjpeg.obj &
@@ -280,6 +281,7 @@ UNIVOBJS = bmpbuttn.obj &
winuniv.obj
UNIVTHEMEOBJS = gtk.obj &
metal.obj &
win32.obj
HTMLOBJS = helpctrl.obj &
@@ -519,6 +521,9 @@ winuniv.obj: $(UNIVDIR)\winuniv.cpp
gtk.obj: $(UNIVTHEMEDIR)\gtk.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
metal.obj: $(UNIVTHEMEDIR)\metal.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
win32.obj: $(UNIVTHEMEDIR)\win32.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -710,6 +715,9 @@ imagbmp.obj: $(COMMDIR)\imagbmp.cpp
image.obj: $(COMMDIR)\image.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagfill.obj: $(COMMDIR)\imagfill.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaggif.obj: $(COMMDIR)\imaggif.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

2
src/msw/files.lst
View File

@@ -215,6 +215,7 @@ ALL_SOURCES = \
msw/helpwin.cpp \
msw/icon.cpp \
msw/imaglist.cpp \
msw/iniconf.cpp \
msw/joystick.cpp \
msw/listbox.cpp \
msw/listctrl.cpp \
@@ -904,6 +905,7 @@ GUIOBJS = \
helpwin.o \
icon.o \
imaglist.o \
iniconf.o \
joystick.o \
listbox.o \
listctrl.o \

5
src/msw/makefile.b32
View File

@@ -299,6 +299,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\imaglist.obj \
$(MSWDIR)\iniconf.obj \
$(MSWDIR)\joystick.obj \
$(MSWDIR)\listbox.obj \
$(MSWDIR)\listctrl.obj \
@@ -553,6 +554,8 @@ $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
@@ -1117,7 +1120,7 @@ $(CFG): makefile.b32
-w-hid # virtual function A hides virtual function B
-tWM
-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(ARCHINCDIR);-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk

1
src/msw/makefile.g95
View File

@@ -333,6 +333,7 @@ MSWOBJS = \
$(MSWDIR)/helpwin.$(OBJSUFF) \
$(MSWDIR)/icon.$(OBJSUFF) \
$(MSWDIR)/imaglist.$(OBJSUFF) \
$(MSWDIR)/iniconf.$(OBJSUFF) \
$(MSWDIR)/joystick.$(OBJSUFF) \
$(MSWDIR)/listbox.$(OBJSUFF) \
$(MSWDIR)/listctrl.$(OBJSUFF) \

1
src/msw/makefile.vc
View File

@@ -319,6 +319,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
$(MSWDIR)\$D\helpwin.obj \
$(MSWDIR)\$D\icon.obj \
$(MSWDIR)\$D\imaglist.obj \
$(MSWDIR)\$D\iniconf.obj \
$(MSWDIR)\$D\joystick.obj \
$(MSWDIR)\$D\listbox.obj \
$(MSWDIR)\$D\listctrl.obj \

2
src/univ/checkbox.cpp
View File

@@ -70,6 +70,8 @@ bool wxCheckBox::Create(wxWindow *parent,
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
m_hasDialogBackground = TRUE;
SetLabel(label);
SetBestSize(size);

2
src/univ/files.lst
View File

@@ -17,6 +17,7 @@ UNIV_SOURCES = \
univ/inphand.cpp \
univ/listbox.cpp \
univ/menu.cpp \
univ/themes/metal.cpp \
univ/notebook.cpp \
univ/radiobox.cpp \
univ/radiobut.cpp \
@@ -95,6 +96,7 @@ UNIVOBJS = \
inphand.o \
listbox.o \
menu.o \
metal.o \
notebook.o \
radiobox.o \
radiobut.o \

2
src/univ/statbmp.cpp
View File

@@ -60,6 +60,8 @@ bool wxStaticBitmap::Create(wxWindow *parent,
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
m_hasDialogBackground = TRUE;
// set bitmap first
SetBitmap(label);

2
src/univ/statbox.cpp
View File

@@ -58,6 +58,8 @@ bool wxStaticBox::Create(wxWindow *parent,
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
m_hasDialogBackground = TRUE;
SetLabel(label);
return TRUE;

2
src/univ/stattext.cpp
View File

@@ -58,6 +58,8 @@ bool wxStaticText::Create(wxWindow *parent,
{
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
m_hasDialogBackground = TRUE;
SetLabel(label);
SetBestSize(size);

2
src/univ/theme.cpp
View File

@@ -99,6 +99,8 @@ wxThemeInfo::wxThemeInfo(Constructor c,
{
#if defined(__WXGTK__)
nameDefTheme = _T("gtk");
#elif defined(__WXX11__)
nameDefTheme = _T("Metal");
#else
nameDefTheme = _T("win32");
#endif

4593
src/univ/themes/metal.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

12
src/univ/winuniv.cpp
View File

@@ -111,6 +111,8 @@ void wxWindow::Init()
m_oldSize.x = -1;
m_oldSize.y = -1;
m_hasDialogBackground = FALSE;
}
bool wxWindow::Create(wxWindow *parent,
@@ -265,10 +267,14 @@ void wxWindow::OnPaint(wxPaintEvent& event)
bool wxWindow::DoDrawBackground(wxDC& dc)
{
// FIXME: leaving this code in leads to partial bg redraws sometimes under
// MSW
// FIXME: Leaving this code in leads to partial bg redraws
// sometimes under MSW.
// The same happens under X11 because it has a clear
// region and an update region and these are sometimes
// different. RR.
wxRect rect;
#ifndef __WXMSW__
// #ifndef __WXMSW__
#if 0
rect = GetUpdateRegion().GetBox();
if ( !rect.width && !rect.height )
#endif

4
src/wxUniv.dsp
View File

@@ -1200,6 +1200,10 @@ SOURCE=.\univ\themes\gtk.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\metal.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\win32.cpp
# End Source File

123
src/wxWindows.dsp
View File

@@ -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,21 +74,18 @@ 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/wxmsw233ud.dll" /pdbtype:sept
# 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.3 /dll /debug /machine:I386 /out:"../lib/wxmsw233ud.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/wxmsw233ud.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.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.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,21 +172,18 @@ 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/wxmsw233d.dll" /pdbtype:sept
# 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.3 /dll /debug /machine:I386 /out:"../lib/wxmsw233d.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/wxmsw233d.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.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.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
@@ -370,12 +352,6 @@ SOURCE=.\common\docview.cpp
# End Source File
# Begin Source File
SOURCE=.\common\dosyacc.c
# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\dseldlg.cpp
# End Source File
# Begin Source File
@@ -404,11 +380,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
@@ -729,11 +700,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
@@ -784,6 +750,24 @@ 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
# Begin Source File
SOURCE=.\common\dosyacc.c
# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
# Begin Group "Generic Files"
@@ -912,6 +896,7 @@ SOURCE=.\generic\treelay.cpp
SOURCE=.\generic\wizard.cpp
# End Source File
# End Group
# Begin Group "wxHTML Files"
@@ -1000,12 +985,18 @@ SOURCE=.\html\m_tables.cpp
SOURCE=.\html\winpars.cpp
# End Source File
# End Group
# Begin Group "MSW Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=.\msw\accel.cpp
# End Source File
# Begin Source File
@@ -1130,11 +1121,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
@@ -1187,16 +1173,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
@@ -1423,6 +1399,18 @@ 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
# End Group
# Begin Group "OLE Files"
@@ -1451,6 +1439,7 @@ SOURCE=.\msw\ole\oleutils.cpp
SOURCE=.\msw\ole\uuid.cpp
# End Source File
# End Group
# Begin Group "Headers"
@@ -1461,9 +1450,7 @@ SOURCE=.\msw\ole\uuid.cpp
# Begin Source File
SOURCE=..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
# Begin Custom Build - Creating $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1471,9 +1458,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1481,9 +1466,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1491,9 +1474,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1501,9 +1482,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1511,9 +1490,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1521,9 +1498,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1531,9 +1506,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 $(TargetPath) from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@@ -1541,9 +1514,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"
@@ -2477,6 +2448,7 @@ SOURCE=..\include\wx\zipstrm.h
SOURCE=..\include\wx\zstream.h
# End Source File
# End Group
# Begin Group "MSW"
@@ -2853,6 +2825,7 @@ SOURCE=..\include\wx\msw\window.h
SOURCE=..\include\wx\msw\winundef.h
# End Source File
# End Group
# Begin Group "Generic"
@@ -3009,6 +2982,7 @@ SOURCE=..\include\wx\generic\treectlg.h
SOURCE=..\include\wx\generic\wizard.h
# End Source File
# End Group
# Begin Group "HTML"
@@ -3065,6 +3039,7 @@ SOURCE=..\include\wx\html\m_templ.h
SOURCE=..\include\wx\html\winpars.h
# End Source File
# End Group
# End Group
# End Target