X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7ac64ee6d33c1ef3dee3431526ca18075ee7c8d..f820e98de02ee9c5d34f28372a2324d9b2909f6c:/build/msw/wx_corelib.dsp diff --git a/build/msw/wx_corelib.dsp b/build/msw/wx_corelib.dsp index 66ea74229d..9ab073cc51 100644 --- a/build/msw/wx_corelib.dsp +++ b/build/msw/wx_corelib.dsp @@ -21,10 +21,10 @@ CFG=corelib - Win32 Unicode Debug !MESSAGE "corelib - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "corelib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "corelib - Win32 Unicode Release" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 wxUniv Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 wxUniv Release" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 wxUniv Unicode Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "corelib - Win32 wxUniv Unicode Release" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 Universal Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 Universal Release" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "corelib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -126,7 +126,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswu\wxmsw25u_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_mswu\wxmsw25u_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -149,7 +149,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivd\wxmswuniv25d_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivd\wxmswuniv25d_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -172,7 +172,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswuniv\wxmswuniv25_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_mswuniv\wxmswuniv25_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -195,7 +195,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" # ADD LIB32 /nologo /out:"..\..\lib\vc_mswunivud\wxmswuniv25ud_core.lib" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -226,624 +226,628 @@ LIB32=link.exe -lib # Name "corelib - Win32 Release" # Name "corelib - Win32 Unicode Debug" # Name "corelib - Win32 Unicode Release" -# Name "corelib - Win32 wxUniv Debug" -# Name "corelib - Win32 wxUniv Release" -# Name "corelib - Win32 wxUniv Unicode Debug" -# Name "corelib - Win32 wxUniv Unicode Release" +# Name "corelib - Win32 Universal Debug" +# Name "corelib - Win32 Universal Release" +# Name "corelib - Win32 Universal Unicode Debug" +# Name "corelib - Win32 Universal Unicode Release" # Begin Group "Common Headers" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\generic\accel.h +SOURCE=..\..\include\wx\accel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\accel.h +SOURCE=..\..\include\wx\access.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\accel.h +SOURCE=..\..\include\wx\afterstd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\access.h +SOURCE=..\..\include\wx\artprov.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\access.h +SOURCE=..\..\include\wx\bitmap.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\afterstd.h +SOURCE=..\..\include\wx\bmpbuttn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\app.h +SOURCE=..\..\include\wx\brush.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\app.h +SOURCE=..\..\include\wx\busyinfo.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\artprov.h +SOURCE=..\..\include\wx\button.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\automtn.h +SOURCE=..\..\include\wx\caret.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\bitmap.h +SOURCE=..\..\include\wx\checkbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\bitmap.h +SOURCE=..\..\include\wx\checklst.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\bmpbuttn.h +SOURCE=..\..\include\wx\choicdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\bmpbuttn.h +SOURCE=..\..\include\wx\choice.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\bmpbuttn.h +SOURCE=..\..\include\wx\clipbrd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\brush.h +SOURCE=..\..\include\wx\cmdproc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\brush.h +SOURCE=..\..\include\wx\cmndata.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\busyinfo.h +SOURCE=..\..\include\wx\colordlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\button.h +SOURCE=..\..\include\wx\colour.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\button.h +SOURCE=..\..\include\wx\combobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\button.h +SOURCE=..\..\include\wx\control.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\caret.h +SOURCE=..\..\include\wx\cshelp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\caret.h +SOURCE=..\..\include\wx\ctrlsub.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\checkbox.h +SOURCE=..\..\include\wx\cursor.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\checkbox.h +SOURCE=..\..\include\wx\dataobj.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\checkbox.h +SOURCE=..\..\include\wx\dc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\checklst.h +SOURCE=..\..\include\wx\dcclient.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\checklst.h +SOURCE=..\..\include\wx\dcmemory.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\checklst.h +SOURCE=..\..\include\wx\dcmirror.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\choicdgg.h +SOURCE=..\..\include\wx\dcprint.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\choicdlg.h +SOURCE=..\..\include\wx\dcps.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\choice.h +SOURCE=..\..\include\wx\dcscreen.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\choice.h +SOURCE=..\..\include\wx\dialog.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\choice.h +SOURCE=..\..\include\wx\dialup.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\clipbrd.h +SOURCE=..\..\include\wx\dirctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\clipbrd.h +SOURCE=..\..\include\wx\dirdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\cmdproc.h +SOURCE=..\..\include\wx\display.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\cmndata.h +SOURCE=..\..\include\wx\dnd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\colordlg.h +SOURCE=..\..\include\wx\docmdi.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\colordlg.h +SOURCE=..\..\include\wx\docview.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\colour.h +SOURCE=..\..\include\wx\dragimag.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\colour.h +SOURCE=..\..\include\wx\effects.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\colrdlgg.h +SOURCE=..\..\include\wx\evtloop.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\colschem.h +SOURCE=..\..\include\wx\fdrepdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\combobox.h +SOURCE=..\..\include\wx\filedlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\combobox.h +SOURCE=..\..\include\wx\fmappriv.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\combobox.h +SOURCE=..\..\include\wx\font.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\control.h +SOURCE=..\..\include\wx\fontdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\control.h +SOURCE=..\..\include\wx\fontenum.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\control.h +SOURCE=..\..\include\wx\fontutil.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\cshelp.h +SOURCE=..\..\include\wx\frame.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\ctrlsub.h +SOURCE=..\..\include\wx\gauge.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\cursor.h +SOURCE=..\..\include\wx\gdicmn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\cursor.h +SOURCE=..\..\include\wx\gdiobj.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\dataform.h +SOURCE=..\..\include\wx\generic\accel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dataobj.h +SOURCE=..\..\include\wx\generic\choicdgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\dataobj.h +SOURCE=..\..\include\wx\generic\colrdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\dataobj2.h +SOURCE=..\..\include\wx\generic\dcpsg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dc.h +SOURCE=..\..\include\wx\generic\dirctrlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dc.h +SOURCE=..\..\include\wx\generic\dirdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dcclient.h +SOURCE=..\..\include\wx\generic\dragimgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcclient.h +SOURCE=..\..\include\wx\generic\fdrepdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dcmemory.h +SOURCE=..\..\include\wx\generic\filedlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcmemory.h +SOURCE=..\..\include\wx\generic\fontdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcmirror.h +SOURCE=..\..\include\wx\generic\imaglist.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcprint.h +SOURCE=..\..\include\wx\generic\listctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dcprint.h +SOURCE=..\..\include\wx\generic\logg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcps.h +SOURCE=..\..\include\wx\generic\mdig.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\dcpsg.h +SOURCE=..\..\include\wx\generic\msgdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dcscreen.h +SOURCE=..\..\include\wx\generic\notebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dcscreen.h +SOURCE=..\..\include\wx\generic\panelg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\dialog.h +SOURCE=..\..\include\wx\generic\prntdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dialog.h +SOURCE=..\..\include\wx\generic\progdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dialog.h +SOURCE=..\..\include\wx\generic\scrolwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dialup.h +SOURCE=..\..\include\wx\generic\spinctlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dib.h +SOURCE=..\..\include\wx\generic\splitter.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dirctrl.h +SOURCE=..\..\include\wx\generic\statusbr.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\dirctrlg.h +SOURCE=..\..\include\wx\generic\tabg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dirdlg.h +SOURCE=..\..\include\wx\generic\textdlgg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dirdlg.h +SOURCE=..\..\include\wx\generic\timer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\dirdlgg.h +SOURCE=..\..\include\wx\generic\treectlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\display.h +SOURCE=..\..\include\wx\geometry.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dnd.h +SOURCE=..\..\include\wx\gifdecod.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\docmdi.h +SOURCE=..\..\include\wx\glcanvas.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\docview.h +SOURCE=..\..\include\wx\help.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\dragimag.h +SOURCE=..\..\include\wx\helpbase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\dragimag.h +SOURCE=..\..\include\wx\helphtml.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\dragimgg.h +SOURCE=..\..\include\wx\helpwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\dropsrc.h +SOURCE=..\..\include\wx\icon.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\droptgt.h +SOURCE=..\..\include\wx\iconbndl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\effects.h +SOURCE=..\..\include\wx\imagbmp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\enhmeta.h +SOURCE=..\..\include\wx\image.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\evtloop.h +SOURCE=..\..\include\wx\imaggif.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\fdrepdlg.h +SOURCE=..\..\include\wx\imagiff.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fdrepdlg.h +SOURCE=..\..\include\wx\imagjpeg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\fdrepdlg.h +SOURCE=..\..\include\wx\imaglist.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\filedlg.h +SOURCE=..\..\include\wx\imagpcx.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\filedlg.h +SOURCE=..\..\include\wx\imagpng.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\filedlgg.h +SOURCE=..\..\include\wx\imagpnm.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fmappriv.h +SOURCE=..\..\include\wx\imagtiff.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\font.h +SOURCE=..\..\include\wx\imagxpm.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\font.h +SOURCE=..\..\include\wx\layout.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\fontdlg.h +SOURCE=..\..\include\wx\listbase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fontdlg.h +SOURCE=..\..\include\wx\listbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\fontdlgg.h +SOURCE=..\..\include\wx\listctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fontenum.h +SOURCE=..\..\include\wx\matrix.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fontutil.h +SOURCE=..\..\include\wx\mdi.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\frame.h +SOURCE=..\..\include\wx\menu.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\frame.h +SOURCE=..\..\include\wx\menuitem.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\frame.h +SOURCE=..\..\include\wx\metafile.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\gauge.h +SOURCE=..\..\include\wx\minifram.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\gauge.h +SOURCE=..\..\include\wx\msgdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gauge95.h +SOURCE=..\..\include\wx\msw\accel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\gdicmn.h +SOURCE=..\..\include\wx\msw\app.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gdiimage.h +SOURCE=..\..\include\wx\msw\bitmap.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\gdiobj.h +SOURCE=..\..\include\wx\msw\bmpbuttn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gdiobj.h +SOURCE=..\..\include\wx\msw\brush.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\geometry.h +SOURCE=..\..\include\wx\msw\button.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\gifdecod.h +SOURCE=..\..\include\wx\msw\caret.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\glcanvas.h +SOURCE=..\..\include\wx\msw\checkbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\help.h +SOURCE=..\..\include\wx\msw\checklst.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\helpbase.h +SOURCE=..\..\include\wx\msw\choice.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\helpbest.h +SOURCE=..\..\include\wx\msw\clipbrd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\helpchm.h +SOURCE=..\..\include\wx\msw\colordlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\helphtml.h +SOURCE=..\..\include\wx\msw\colour.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\helpwin.h +SOURCE=..\..\include\wx\msw\combobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\helpwin.h +SOURCE=..\..\include\wx\msw\control.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\icon.h +SOURCE=..\..\include\wx\msw\cursor.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\icon.h +SOURCE=..\..\include\wx\msw\dc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\iconbndl.h +SOURCE=..\..\include\wx\msw\dcclient.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagbmp.h +SOURCE=..\..\include\wx\msw\dcmemory.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\image.h +SOURCE=..\..\include\wx\msw\dcprint.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imaggif.h +SOURCE=..\..\include\wx\msw\dcscreen.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagiff.h +SOURCE=..\..\include\wx\msw\dialog.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagjpeg.h +SOURCE=..\..\include\wx\msw\dib.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\imaglist.h +SOURCE=..\..\include\wx\msw\dirdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imaglist.h +SOURCE=..\..\include\wx\msw\dragimag.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\imaglist.h +SOURCE=..\..\include\wx\msw\enhmeta.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagpcx.h +SOURCE=..\..\include\wx\msw\fdrepdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagpng.h +SOURCE=..\..\include\wx\msw\filedlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagpnm.h +SOURCE=..\..\include\wx\msw\font.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagtiff.h +SOURCE=..\..\include\wx\msw\fontdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\imagxpm.h +SOURCE=..\..\include\wx\msw\frame.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\iniconf.h +SOURCE=..\..\include\wx\msw\gauge95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\inpcons.h +SOURCE=..\..\include\wx\msw\gdiimage.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\inphand.h +SOURCE=..\..\include\wx\msw\gdiobj.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\layout.h +SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\listbase.h +SOURCE=..\..\include\wx\msw\helpbest.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\listbox.h +SOURCE=..\..\include\wx\msw\helpchm.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\listbox.h +SOURCE=..\..\include\wx\msw\helpwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\listbox.h +SOURCE=..\..\include\wx\msw\icon.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\listctrl.h +SOURCE=..\..\include\wx\msw\imaglist.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\listctrl.h +SOURCE=..\..\include\wx\msw\iniconf.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\listbox.h # End Source File # Begin Source File @@ -851,287 +855,295 @@ SOURCE=..\..\include\wx\msw\listctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\logg.h +SOURCE=..\..\include\wx\msw\mdi.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\matrix.h +SOURCE=..\..\include\wx\msw\menu.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\mdi.h +SOURCE=..\..\include\wx\msw\menuitem.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\mdi.h +SOURCE=..\..\include\wx\msw\metafile.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\mdig.h +SOURCE=..\..\include\wx\msw\minifram.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\menu.h +SOURCE=..\..\include\wx\msw\missing.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\menu.h +SOURCE=..\..\include\wx\msw\msgdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\menu.h +SOURCE=..\..\include\wx\msw\mslu.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\menuitem.h +SOURCE=..\..\include\wx\msw\msvcrt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\menuitem.h +SOURCE=..\..\include\wx\msw\notebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\menuitem.h +SOURCE=..\..\include\wx\msw\ole\access.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\metafile.h +SOURCE=..\..\include\wx\msw\ole\automtn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\metafile.h +SOURCE=..\..\include\wx\msw\ole\dataform.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\minifram.h +SOURCE=..\..\include\wx\msw\ole\dataobj.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\minifram.h +SOURCE=..\..\include\wx\msw\ole\dataobj2.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\missing.h +SOURCE=..\..\include\wx\msw\ole\dropsrc.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msgdlg.h +SOURCE=..\..\include\wx\msw\ole\droptgt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\msgdlg.h +SOURCE=..\..\include\wx\msw\ole\oleutils.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\msgdlgg.h +SOURCE=..\..\include\wx\msw\ole\uuid.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\mslu.h +SOURCE=..\..\include\wx\msw\palette.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\msvcrt.h +SOURCE=..\..\include\wx\msw\pen.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\notebook.h +SOURCE=..\..\include\wx\msw\printdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\notebook.h +SOURCE=..\..\include\wx\msw\printwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\notebook.h +SOURCE=..\..\include\wx\msw\private.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\notebook.h +SOURCE=..\..\include\wx\msw\radiobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\oleutils.h +SOURCE=..\..\include\wx\msw\radiobut.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\ownerdrw.h +SOURCE=..\..\include\wx\msw\regconf.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\palette.h +SOURCE=..\..\include\wx\msw\region.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\palette.h +SOURCE=..\..\include\wx\msw\registry.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\panel.h +SOURCE=..\..\include\wx\msw\scrolbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\panelg.h +SOURCE=..\..\include\wx\msw\setup0.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\paper.h +SOURCE=..\..\include\wx\msw\slider95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\pen.h +SOURCE=..\..\include\wx\msw\slidrmsw.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\pen.h +SOURCE=..\..\include\wx\msw\spinbutt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\popupwin.h +SOURCE=..\..\include\wx\msw\spinctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\print.h +SOURCE=..\..\include\wx\msw\statbmp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\printdlg.h +SOURCE=..\..\include\wx\msw\statbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\printdlg.h +SOURCE=..\..\include\wx\msw\statbr95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\printwin.h +SOURCE=..\..\include\wx\msw\statline.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\private.h +SOURCE=..\..\include\wx\msw\stattext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\prntbase.h +SOURCE=..\..\include\wx\msw\tabctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\prntdlgg.h +SOURCE=..\..\include\wx\msw\tbar95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\progdlg.h +SOURCE=..\..\include\wx\msw\tbarmsw.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\progdlgg.h +SOURCE=..\..\include\wx\msw\textctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\ptr_scpd.h +SOURCE=..\..\include\wx\msw\tglbtn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\quantize.h +SOURCE=..\..\include\wx\msw\timer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\radiobox.h +SOURCE=..\..\include\wx\msw\tooltip.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\radiobox.h +SOURCE=..\..\include\wx\msw\toplevel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\radiobox.h +SOURCE=..\..\include\wx\msw\treectrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\radiobut.h +SOURCE=..\..\include\wx\msw\window.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\radiobut.h +SOURCE=..\..\include\wx\notebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\radiobut.h +SOURCE=..\..\include\wx\ownerdrw.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\rawbmp.h +SOURCE=..\..\include\wx\palette.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\regconf.h +SOURCE=..\..\include\wx\panel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\region.h +SOURCE=..\..\include\wx\paper.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\region.h +SOURCE=..\..\include\wx\pen.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\registry.h +SOURCE=..\..\include\wx\popupwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\renderer.h +SOURCE=..\..\include\wx\print.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\renderer.h +SOURCE=..\..\include\wx\printdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\scopeguard.h +SOURCE=..\..\include\wx\prntbase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\scrarrow.h +SOURCE=..\..\include\wx\progdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\scrolbar.h +SOURCE=..\..\include\wx\ptr_scpd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\scrolbar.h +SOURCE=..\..\include\wx\quantize.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\scrolbar.h +SOURCE=..\..\include\wx\radiobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\scrolwin.h +SOURCE=..\..\include\wx\radiobut.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\scrolwin.h +SOURCE=..\..\include\wx\rawbmp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\scrthumb.h +SOURCE=..\..\include\wx\region.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\scrtimer.h +SOURCE=..\..\include\wx\renderer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\selstore.h +SOURCE=..\..\include\wx\scopeguard.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\settings.h +SOURCE=..\..\include\wx\scrolbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\setup0.h +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 @@ -1143,243 +1155,243 @@ SOURCE=..\..\include\wx\slider.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\slider.h +SOURCE=..\..\include\wx\spinbutt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\slider95.h +SOURCE=..\..\include\wx\spinctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\slidrmsw.h +SOURCE=..\..\include\wx\splitter.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\spinbutt.h +SOURCE=..\..\include\wx\stack.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\spinbutt.h +SOURCE=..\..\include\wx\statbmp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\spinbutt.h +SOURCE=..\..\include\wx\statbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\spinctlg.h +SOURCE=..\..\include\wx\statline.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\spinctrl.h +SOURCE=..\..\include\wx\stattext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\spinctrl.h +SOURCE=..\..\include\wx\statusbr.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\splitter.h +SOURCE=..\..\include\wx\tab.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\splitter.h +SOURCE=..\..\include\wx\tabctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\stack.h +SOURCE=..\..\include\wx\tbarbase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\statbmp.h +SOURCE=..\..\include\wx\tbarsmpl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\statbmp.h +SOURCE=..\..\include\wx\textctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statbmp.h +SOURCE=..\..\include\wx\textdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\statbox.h +SOURCE=..\..\include\wx\tglbtn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statbox.h +SOURCE=..\..\include\wx\timer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\statbox.h +SOURCE=..\..\include\wx\tipwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statbr95.h +SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\statline.h +SOURCE=..\..\include\wx\tooltip.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\statline.h +SOURCE=..\..\include\wx\toplevel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\statline.h +SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\stattext.h +SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\stattext.h +SOURCE=..\..\include\wx\univ\app.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\stattext.h +SOURCE=..\..\include\wx\univ\bmpbuttn.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\statusbr.h +SOURCE=..\..\include\wx\univ\button.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\statusbr.h +SOURCE=..\..\include\wx\univ\checkbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\statusbr.h +SOURCE=..\..\include\wx\univ\checklst.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tab.h +SOURCE=..\..\include\wx\univ\choice.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tabctrl.h +SOURCE=..\..\include\wx\univ\colschem.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tabctrl.h +SOURCE=..\..\include\wx\univ\combobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\tabg.h +SOURCE=..\..\include\wx\univ\control.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbar95.h +SOURCE=..\..\include\wx\univ\dialog.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tbarbase.h +SOURCE=..\..\include\wx\univ\frame.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbarmsw.h +SOURCE=..\..\include\wx\univ\gauge.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tbarsmpl.h +SOURCE=..\..\include\wx\univ\inpcons.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\textctrl.h +SOURCE=..\..\include\wx\univ\inphand.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\textctrl.h +SOURCE=..\..\include\wx\univ\listbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\textctrl.h +SOURCE=..\..\include\wx\univ\menu.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\textdlg.h +SOURCE=..\..\include\wx\univ\menuitem.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\textdlgg.h +SOURCE=..\..\include\wx\univ\notebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tglbtn.h +SOURCE=..\..\include\wx\univ\radiobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tglbtn.h +SOURCE=..\..\include\wx\univ\radiobut.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\theme.h +SOURCE=..\..\include\wx\univ\renderer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\timer.h +SOURCE=..\..\include\wx\univ\scrarrow.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\timer.h +SOURCE=..\..\include\wx\univ\scrolbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\timer.h +SOURCE=..\..\include\wx\univ\scrthumb.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tipwin.h +SOURCE=..\..\include\wx\univ\scrtimer.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\toolbar.h +SOURCE=..\..\include\wx\univ\slider.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\toolbar.h +SOURCE=..\..\include\wx\univ\spinbutt.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\tooltip.h +SOURCE=..\..\include\wx\univ\statbmp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tooltip.h +SOURCE=..\..\include\wx\univ\statbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\toplevel.h +SOURCE=..\..\include\wx\univ\statline.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\toplevel.h +SOURCE=..\..\include\wx\univ\stattext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\toplevel.h +SOURCE=..\..\include\wx\univ\statusbr.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\treebase.h +SOURCE=..\..\include\wx\univ\textctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\treectlg.h +SOURCE=..\..\include\wx\univ\theme.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\treectrl.h +SOURCE=..\..\include\wx\univ\toolbar.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\treectrl.h +SOURCE=..\..\include\wx\univ\toplevel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ole\uuid.h +SOURCE=..\..\include\wx\univ\window.h # End Source File # Begin Source File @@ -1407,22 +1419,10 @@ SOURCE=..\..\include\wx\vscroll.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\window.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\window.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\univ\window.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\xpmdecod.h # End Source File # Begin Source File @@ -1453,16 +1453,16 @@ SOURCE=..\..\src\generic\accel.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1496,16 +1496,16 @@ SOURCE=..\..\src\generic\colrdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1539,16 +1539,16 @@ SOURCE=..\..\src\generic\dirdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1578,16 +1578,16 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1613,16 +1613,16 @@ SOURCE=..\..\src\generic\filedlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1648,16 +1648,16 @@ SOURCE=..\..\src\generic\fontdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1683,16 +1683,16 @@ SOURCE=..\..\src\generic\imaglist.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1718,16 +1718,16 @@ SOURCE=..\..\src\generic\listctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1757,16 +1757,16 @@ SOURCE=..\..\src\generic\mdig.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1792,16 +1792,16 @@ SOURCE=..\..\src\generic\msgdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1835,16 +1835,16 @@ SOURCE=..\..\src\generic\prntdlgg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1890,19 +1890,19 @@ SOURCE=..\..\src\generic\statusbr.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -1929,16 +1929,16 @@ SOURCE=..\..\src\generic\tabg.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -1992,16 +1992,16 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2027,16 +2027,16 @@ SOURCE=..\..\src\univ\button.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2062,16 +2062,16 @@ SOURCE=..\..\src\univ\checkbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2097,16 +2097,16 @@ SOURCE=..\..\src\univ\checklst.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2132,16 +2132,16 @@ SOURCE=..\..\src\univ\choice.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2167,16 +2167,16 @@ SOURCE=..\..\src\univ\colschem.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2202,16 +2202,16 @@ SOURCE=..\..\src\univ\combobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2237,16 +2237,16 @@ SOURCE=..\..\src\univ\control.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2272,16 +2272,16 @@ SOURCE=..\..\src\univ\ctrlrend.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2307,16 +2307,16 @@ SOURCE=..\..\src\univ\dialog.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2342,16 +2342,16 @@ SOURCE=..\..\src\univ\framuniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2377,16 +2377,16 @@ SOURCE=..\..\src\univ\gauge.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2394,7 +2394,7 @@ SOURCE=..\..\src\univ\gauge.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\themes\gtk.cpp +SOURCE=..\..\src\univ\inpcons.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2412,16 +2412,16 @@ SOURCE=..\..\src\univ\themes\gtk.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2429,7 +2429,7 @@ SOURCE=..\..\src\univ\themes\gtk.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\inpcons.cpp +SOURCE=..\..\src\univ\inphand.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2447,16 +2447,16 @@ SOURCE=..\..\src\univ\inpcons.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2464,7 +2464,7 @@ SOURCE=..\..\src\univ\inpcons.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\inphand.cpp +SOURCE=..\..\src\univ\listbox.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2482,16 +2482,16 @@ SOURCE=..\..\src\univ\inphand.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2499,7 +2499,7 @@ SOURCE=..\..\src\univ\inphand.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\listbox.cpp +SOURCE=..\..\src\univ\menu.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2517,16 +2517,16 @@ SOURCE=..\..\src\univ\listbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2534,7 +2534,7 @@ SOURCE=..\..\src\univ\listbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\menu.cpp +SOURCE=..\..\src\univ\notebook.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2552,16 +2552,16 @@ SOURCE=..\..\src\univ\menu.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2569,7 +2569,7 @@ SOURCE=..\..\src\univ\menu.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\themes\metal.cpp +SOURCE=..\..\src\univ\radiobox.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2587,16 +2587,16 @@ SOURCE=..\..\src\univ\themes\metal.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2604,7 +2604,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\notebook.cpp +SOURCE=..\..\src\univ\radiobut.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2622,16 +2622,16 @@ SOURCE=..\..\src\univ\notebook.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2639,7 +2639,7 @@ SOURCE=..\..\src\univ\notebook.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\radiobox.cpp +SOURCE=..\..\src\univ\scrarrow.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2657,16 +2657,16 @@ SOURCE=..\..\src\univ\radiobox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2674,7 +2674,7 @@ SOURCE=..\..\src\univ\radiobox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\radiobut.cpp +SOURCE=..\..\src\univ\scrolbar.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2692,16 +2692,16 @@ SOURCE=..\..\src\univ\radiobut.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2709,7 +2709,7 @@ SOURCE=..\..\src\univ\radiobut.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrarrow.cpp +SOURCE=..\..\src\univ\scrthumb.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2727,16 +2727,16 @@ SOURCE=..\..\src\univ\scrarrow.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2744,7 +2744,7 @@ SOURCE=..\..\src\univ\scrarrow.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrolbar.cpp +SOURCE=..\..\src\univ\slider.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2762,16 +2762,16 @@ SOURCE=..\..\src\univ\scrolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2779,7 +2779,7 @@ SOURCE=..\..\src\univ\scrolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrthumb.cpp +SOURCE=..\..\src\univ\spinbutt.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2797,16 +2797,16 @@ SOURCE=..\..\src\univ\scrthumb.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2814,7 +2814,7 @@ SOURCE=..\..\src\univ\scrthumb.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\slider.cpp +SOURCE=..\..\src\univ\statbmp.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2832,16 +2832,16 @@ SOURCE=..\..\src\univ\slider.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2849,7 +2849,7 @@ SOURCE=..\..\src\univ\slider.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\spinbutt.cpp +SOURCE=..\..\src\univ\statbox.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2867,16 +2867,16 @@ SOURCE=..\..\src\univ\spinbutt.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2884,7 +2884,7 @@ SOURCE=..\..\src\univ\spinbutt.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statbmp.cpp +SOURCE=..\..\src\univ\statline.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2902,16 +2902,16 @@ SOURCE=..\..\src\univ\statbmp.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2919,7 +2919,7 @@ SOURCE=..\..\src\univ\statbmp.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statbox.cpp +SOURCE=..\..\src\univ\stattext.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2937,16 +2937,16 @@ SOURCE=..\..\src\univ\statbox.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2954,7 +2954,7 @@ SOURCE=..\..\src\univ\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statline.cpp +SOURCE=..\..\src\univ\statusbr.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -2972,16 +2972,16 @@ SOURCE=..\..\src\univ\statline.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -2989,7 +2989,7 @@ SOURCE=..\..\src\univ\statline.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\stattext.cpp +SOURCE=..\..\src\univ\textctrl.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3007,16 +3007,16 @@ SOURCE=..\..\src\univ\stattext.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3024,7 +3024,7 @@ SOURCE=..\..\src\univ\stattext.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statusbr.cpp +SOURCE=..\..\src\univ\theme.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3042,16 +3042,16 @@ SOURCE=..\..\src\univ\statusbr.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3059,7 +3059,7 @@ SOURCE=..\..\src\univ\statusbr.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\textctrl.cpp +SOURCE=..\..\src\univ\themes\gtk.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3077,16 +3077,16 @@ SOURCE=..\..\src\univ\textctrl.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3094,7 +3094,7 @@ SOURCE=..\..\src\univ\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\theme.cpp +SOURCE=..\..\src\univ\themes\metal.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3112,16 +3112,16 @@ SOURCE=..\..\src\univ\theme.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3129,7 +3129,7 @@ SOURCE=..\..\src\univ\theme.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\toolbar.cpp +SOURCE=..\..\src\univ\themes\win32.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3147,16 +3147,16 @@ SOURCE=..\..\src\univ\toolbar.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3164,7 +3164,7 @@ SOURCE=..\..\src\univ\toolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\topluniv.cpp +SOURCE=..\..\src\univ\toolbar.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3182,16 +3182,16 @@ SOURCE=..\..\src\univ\topluniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3199,7 +3199,7 @@ SOURCE=..\..\src\univ\topluniv.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\themes\win32.cpp +SOURCE=..\..\src\univ\topluniv.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -3217,16 +3217,16 @@ SOURCE=..\..\src\univ\themes\win32.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3252,16 +3252,16 @@ SOURCE=..\..\src\univ\winuniv.cpp # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" !ENDIF @@ -3591,54 +3591,19 @@ SOURCE=..\..\src\msw\accel.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\ole\access.cpp - -!IF "$(CFG)" == "corelib - Win32 Debug" - - -!ELSEIF "$(CFG)" == "corelib - Win32 Release" - - -!ELSEIF "$(CFG)" == "corelib - Win32 Unicode Debug" - - -!ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" - - -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3651,10 +3616,6 @@ SOURCE=..\..\src\msw\app.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\automtn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\bitmap.cpp # End Source File # Begin Source File @@ -3673,19 +3634,19 @@ SOURCE=..\..\src\msw\bmpbuttn.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3712,19 +3673,19 @@ SOURCE=..\..\src\msw\button.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3751,19 +3712,19 @@ SOURCE=..\..\src\msw\checkbox.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3786,19 +3747,19 @@ SOURCE=..\..\src\msw\checklst.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3821,19 +3782,19 @@ SOURCE=..\..\src\msw\choice.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3860,19 +3821,19 @@ SOURCE=..\..\src\msw\colordlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3899,19 +3860,19 @@ SOURCE=..\..\src\msw\combobox.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3934,19 +3895,19 @@ SOURCE=..\..\src\msw\control.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -3963,10 +3924,6 @@ SOURCE=..\..\src\msw\data.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\dataobj.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\dc.cpp # End Source File # Begin Source File @@ -4001,19 +3958,19 @@ SOURCE=..\..\src\msw\dialog.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4052,19 +4009,19 @@ SOURCE=..\..\src\msw\dragimag.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4073,14 +4030,6 @@ SOURCE=..\..\src\msw\dragimag.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\dropsrc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\ole\droptgt.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\dummy.cpp # ADD BASE CPP /Yc"wx/wxprec.h" # ADD CPP /Yc"wx/wxprec.h" @@ -4109,19 +4058,19 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4144,19 +4093,19 @@ SOURCE=..\..\src\msw\filedlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4183,19 +4132,19 @@ SOURCE=..\..\src\msw\fontdlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4226,19 +4175,19 @@ SOURCE=..\..\src\msw\frame.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4261,19 +4210,19 @@ SOURCE=..\..\src\msw\gauge95.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4290,6 +4239,11 @@ SOURCE=..\..\src\msw\gdiobj.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\helpchm.cpp # End Source File # Begin Source File @@ -4316,19 +4270,19 @@ SOURCE=..\..\src\msw\imaglist.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4351,19 +4305,19 @@ SOURCE=..\..\src\msw\iniconf.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4386,19 +4340,19 @@ SOURCE=..\..\src\msw\listbox.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4421,19 +4375,19 @@ SOURCE=..\..\src\msw\listctrl.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4460,19 +4414,19 @@ SOURCE=..\..\src\msw\mdi.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4495,19 +4449,19 @@ SOURCE=..\..\src\msw\menu.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4530,19 +4484,19 @@ SOURCE=..\..\src\msw\menuitem.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4565,19 +4519,19 @@ SOURCE=..\..\src\msw\metafile.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4604,19 +4558,19 @@ SOURCE=..\..\src\msw\msgdlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4643,19 +4597,19 @@ SOURCE=..\..\src\msw\nativdlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4678,19 +4632,54 @@ SOURCE=..\..\src\msw\notebook.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\ole\access.cpp + +!IF "$(CFG)" == "corelib - Win32 Debug" + + +!ELSEIF "$(CFG)" == "corelib - Win32 Release" + + +!ELSEIF "$(CFG)" == "corelib - Win32 Unicode Debug" + + +!ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" + + +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4699,10 +4688,30 @@ SOURCE=..\..\src\msw\notebook.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\ole\automtn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\ole\dropsrc.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\ole\oleutils.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\ole\uuid.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\ownerdrw.cpp !IF "$(CFG)" == "corelib - Win32 Debug" @@ -4717,19 +4726,19 @@ SOURCE=..\..\src\msw\ownerdrw.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4760,19 +4769,19 @@ SOURCE=..\..\src\msw\penwin.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4799,19 +4808,19 @@ SOURCE=..\..\src\msw\printdlg.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4834,19 +4843,19 @@ SOURCE=..\..\src\msw\printwin.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4869,19 +4878,19 @@ SOURCE=..\..\src\msw\radiobox.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4904,19 +4913,19 @@ SOURCE=..\..\src\msw\radiobut.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4947,19 +4956,19 @@ SOURCE=..\..\src\msw\scrolbar.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -4986,19 +4995,19 @@ SOURCE=..\..\src\msw\slider95.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5021,19 +5030,19 @@ SOURCE=..\..\src\msw\spinbutt.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5056,19 +5065,19 @@ SOURCE=..\..\src\msw\spinctrl.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5091,19 +5100,19 @@ SOURCE=..\..\src\msw\statbmp.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5126,19 +5135,19 @@ SOURCE=..\..\src\msw\statbox.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5161,19 +5170,19 @@ SOURCE=..\..\src\msw\statbr95.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5196,19 +5205,19 @@ SOURCE=..\..\src\msw\statline.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5231,19 +5240,19 @@ SOURCE=..\..\src\msw\stattext.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5266,19 +5275,19 @@ SOURCE=..\..\src\msw\tabctrl.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5301,19 +5310,19 @@ SOURCE=..\..\src\msw\tbar95.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5336,19 +5345,19 @@ SOURCE=..\..\src\msw\textctrl.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5371,19 +5380,19 @@ SOURCE=..\..\src\msw\tglbtn.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5418,19 +5427,19 @@ SOURCE=..\..\src\msw\treectrl.cpp !ELSEIF "$(CFG)" == "corelib - Win32 Unicode Release" -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Release" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Debug" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Debug" # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "corelib - Win32 wxUniv Unicode Release" +!ELSEIF "$(CFG)" == "corelib - Win32 Universal Unicode Release" # PROP Exclude_From_Build 1 @@ -5443,10 +5452,6 @@ SOURCE=..\..\src\msw\utilsgui.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\uuid.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\uxtheme.cpp # End Source File # Begin Source File