From: Ryan Norton Date: Sun, 14 Dec 2003 16:57:30 +0000 (+0000) Subject: 1. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1ce5dd35ebae68444e0faca73f087c63a8314a05 1. Fixed Exception handling in MSVC project (\\GX) 2. No longer wxUSE_NEW_REGEX, just wxUSE_UNICODE 3. Various changes concerning #2 NOTE: I testing this in unicode and it works!! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/regex.cpp b/src/common/regex.cpp index 7f23266dd5..44599dfa90 100644 --- a/src/common/regex.cpp +++ b/src/common/regex.cpp @@ -49,7 +49,7 @@ #include "wx/regex.h" -#ifdef wxUSE_NEW_REGEX +#ifdef wxUSE_UNICODE #define regerror wx_regerror #define regfree wx_regfree #endif @@ -187,7 +187,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) // compile it -#if wxUSE_NEW_REGEX +#if wxUSE_UNICODE int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE); #else int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE); @@ -266,7 +266,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const } // do match it -#ifdef wxUSE_NEW_REGEX +#ifdef wxUSE_UNICODE rm_detail_t rd; int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE); #else diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h index 15ea15f495..5e31745d4c 100644 --- a/src/regex/regcustom.h +++ b/src/regex/regcustom.h @@ -41,25 +41,16 @@ || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) ) #endif -#ifdef wxUSE_NEW_REGEX - - #if !wxUSE_UNICODE - # define wx_wchar char - #else // Unicode - #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96)) - # define wx_wchar __WCHAR_TYPE__ - #else // __WCHAR_TYPE__ and gcc < 2.96 - // standard case - # define wx_wchar wchar_t - #endif // __WCHAR_TYPE__ - #endif // ASCII/Unicode - -#else - - #define wx_wchar char - -#endif - +#if !wxUSE_UNICODE +# define wx_wchar char +#else // Unicode + #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96)) + # define wx_wchar __WCHAR_TYPE__ + #else // __WCHAR_TYPE__ and gcc < 2.96 + // standard case + # define wx_wchar wchar_t + #endif // __WCHAR_TYPE__ +#endif // ASCII/Unicode /* overrides for regguts.h definitions, if any */ #define FUNCPTR(name, args) (*name) args diff --git a/src/regex/regex.dsp b/src/regex/regex.dsp index 92f8f17564..ac8f76f759 100644 --- a/src/regex/regex.dsp +++ b/src/regex/regex.dsp @@ -19,6 +19,7 @@ CFG=regex - Win32 Debug !MESSAGE !MESSAGE "regex - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "regex - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "regex - Win32 Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -41,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W1 /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# ADD CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -65,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W1 /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -75,12 +76,38 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\lib\regexd.lib" +!ELSEIF "$(CFG)" == "regex - Win32 Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "regex___Win32_Release_Unicode" +# PROP BASE Intermediate_Dir "regex___Win32_Release_Unicode" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "regex___Win32_Release_Unicode" +# PROP Intermediate_Dir "regex___Win32_Release_Unicode" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\lib\regex.lib" +# ADD LIB32 /nologo /out:"..\..\lib\regex.lib" + !ENDIF # Begin Target # Name "regex - Win32 Release" # Name "regex - Win32 Debug" +# Name "regex - Win32 Release Unicode" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -104,8 +131,10 @@ SOURCE=.\regfree.c # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\regcustom.h +# End Source File # End Group # End Target # End Project - - diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 1616528df3..f7ebbefa63 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -49,7 +49,7 @@ CFG=wxWindows - Win32 Debug # 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" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -78,7 +78,7 @@ LINK32=link.exe # 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" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -106,7 +106,7 @@ LINK32=link.exe # 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" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -131,7 +131,7 @@ LIB32=link.exe -lib # 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" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -157,7 +157,7 @@ LIB32=link.exe -lib # 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" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -186,7 +186,7 @@ LINK32=link.exe # 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" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -214,7 +214,7 @@ LINK32=link.exe # 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" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -239,7 +239,7 @@ LIB32=link.exe -lib # 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" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -264,7 +264,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -1111,10 +1111,18 @@ SOURCE=.\msw\accel.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\access.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\app.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\automtn.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\basemsw.cpp # End Source File # Begin Source File @@ -1183,6 +1191,10 @@ SOURCE=.\msw\data.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\dc.cpp # End Source File # Begin Source File @@ -1235,6 +1247,14 @@ SOURCE=.\msw\dragimag.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\dummy.cpp # ADD CPP /Yc"wx/wxprec.h" # End Source File @@ -1382,34 +1402,10 @@ SOURCE=.\msw\notebook.cpp # End Source File # 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 -# Begin Source File - SOURCE=.\msw\ownerdrw.cpp # End Source File # Begin Source File @@ -1554,6 +1550,10 @@ SOURCE=.\msw\utilsgui.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\uuid.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\uxtheme.cpp # End Source File # Begin Source File @@ -2006,6 +2006,10 @@ SOURCE=..\include\wx\file.h # End Source File # Begin Source File +SOURCE=..\include\wx\protocol\file.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\fileconf.h # End Source File # Begin Source File @@ -2070,6 +2074,10 @@ SOURCE=..\include\wx\fs_zip.h # End Source File # Begin Source File +SOURCE=..\include\wx\protocol\ftp.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\gauge.h # End Source File # Begin Source File @@ -2142,6 +2150,10 @@ SOURCE=..\include\wx\htmllbox.h # End Source File # Begin Source File +SOURCE=..\include\wx\protocol\http.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\icon.h # End Source File # Begin Source File @@ -2390,18 +2402,6 @@ SOURCE=..\include\wx\progdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\protocol\file.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\protocol\ftp.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\protocol\http.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\protocol\protocol.h # End Source File # Begin Source File @@ -2770,6 +2770,10 @@ SOURCE=..\include\wx\msw\accel.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\access.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\app.h # End Source File # Begin Source File @@ -2782,6 +2786,10 @@ SOURCE=..\include\wx\msw\apptrait.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\automtn.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\bitmap.h # End Source File # Begin Source File @@ -2846,6 +2854,18 @@ SOURCE=..\include\wx\msw\cursor.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\dataform.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj2.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\dc.h # End Source File # Begin Source File @@ -2886,6 +2906,14 @@ SOURCE=..\include\wx\msw\dragimag.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\dropsrc.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\droptgt.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\enhmeta.h # End Source File # Begin Source File @@ -2930,10 +2958,6 @@ SOURCE=..\include\wx\msw\glcanvas.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gnuwin32\winresrc.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\gsockmsw.h # End Source File # Begin Source File @@ -3018,42 +3042,10 @@ SOURCE=..\include\wx\msw\notebook.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\access.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\automtn.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dataform.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dataobj.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dataobj2.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dropsrc.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\droptgt.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\ole\oleutils.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\uuid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\palette.h # End Source File # Begin Source File @@ -3178,6 +3170,10 @@ SOURCE=..\include\wx\msw\treectrl.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\uuid.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\wave.h # End Source File # Begin Source File @@ -3186,6 +3182,10 @@ SOURCE=..\include\wx\msw\window.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\gnuwin32\winresrc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\winundef.h # End Source File # Begin Source File