Put the deprecation wrapper on __init__, not the class

[wxWidgets.git] / build / bakefiles / files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 6618b5e17c8d3681ba3d03f4846a6dd766ccefc9..bc0ec3d4dde91be176b1ef49d872ee7bbd720de0 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -30,6 +30,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        XWIN_LOWLEVEL                 low-level classes for X Window System
                                      ports (wxGTK, wxMotif, wxX11)
 
        XWIN_LOWLEVEL                 low-level classes for X Window System
                                      ports (wxGTK, wxMotif, wxX11)
 

+       MSW_DESKTOP                   files used only on desktop Windows
+                                     versions and not under Windows CE
+
+       xxx_NATIVE                    native files not used by wxUniv (used as
+                                     complement of LOWLEVEL when most of the
+                                     files are lowlevel and only few are native)
+

        HTML                          wxHTML files
        XRC                           wxXRC files
 
        HTML                          wxHTML files
        XRC                           wxXRC files
 


@@ -49,8 +56,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp

+    src/unix/dlunix.cpp

     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp

+    src/unix/stackwalk.cpp

     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
 </set>
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
 </set>


@@ -63,6 +72,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
     wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/pipe.h

+    wx/unix/stackwalk.h

     wx/unix/stdpaths.h
 </set>
 
     wx/unix/stdpaths.h
 </set>
 


@@ -72,12 +82,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp

+    src/msw/debughlp.cpp

     src/msw/dde.cpp
     src/msw/dir.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp

+    src/msw/dlmsw.cpp

     src/msw/mimetype.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
     src/msw/mimetype.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp

+    src/msw/stackwalk.cpp

     src/msw/stdpaths.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp


@@ -97,8 +110,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/chkconf.h
     wx/msw/crashrpt.h
     wx/msw/dde.h
     wx/msw/chkconf.h
     wx/msw/crashrpt.h
     wx/msw/dde.h

+    wx/msw/debughlp.h

     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h

+    wx/msw/stackwalk.h

     wx/msw/winundef.h
     wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
     wx/msw/winundef.h
     wx/msw/wrapcctl.h
     wx/msw/wrapwin.h


@@ -167,6 +182,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MAC_OSX_SRC" hints="files">
     src/unix/baseunix.cpp
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MAC_OSX_SRC" hints="files">
     src/unix/baseunix.cpp

+    src/unix/dlunix.cpp

     src/unix/stdpaths.cpp
 </set>
 <set var="BASE_MAC_OSX_HDR" hints="files">
     src/unix/stdpaths.cpp
 </set>
 <set var="BASE_MAC_OSX_HDR" hints="files">


@@ -344,6 +360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h

+    wx/stackwalk.h

     wx/stdpaths.h
     wx/stockitem.h
     wx/stopwatch.h
     wx/stdpaths.h
     wx/stockitem.h
     wx/stopwatch.h


@@ -1188,14 +1205,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 

-<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">

     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/uuid.cpp
 </set>
 
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/uuid.cpp
 </set>
 

-<set var="MSW_ONLY_LOWLEVEL_HDR" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">

     wx/msw/helpchm.h
     wx/msw/helpwin.h
 </set>
     wx/msw/helpchm.h
     wx/msw/helpwin.h
 </set>


@@ -1379,11 +1396,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
 </set>
 
 <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->

-<set var="MSW_ONLY_SRC" hints="files">
+<set var="MSW_DESKTOP_SRC" hints="files">

     src/msw/fdrepdlg.cpp
     src/msw/fontdlg.cpp
 </set>
     src/msw/fdrepdlg.cpp
     src/msw/fontdlg.cpp
 </set>

-<set var="MSW_ONLY_HDR" hints="files">
+<set var="MSW_DESKTOP_HDR" hints="files">

     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
     wx/msw/helpbest.h
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
     wx/msw/helpbest.h


@@ -2021,6 +2038,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/statline2.mm
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm
     src/cocoa/statline2.mm
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm

+    src/cocoa/timer.mm

     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm


@@ -2041,7 +2059,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp

-    src/generic/timer.cpp

 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h


@@ -2111,6 +2128,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h

+    wx/cocoa/timer.h

     wx/cocoa/toolbar.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     wx/cocoa/toolbar.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h


@@ -2243,6 +2261,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp

+    src/generic/datectlg.cpp

     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp


@@ -2256,8 +2275,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h

+    wx/dateevt.h

     wx/dcbuffer.h
     wx/generic/calctrl.h
     wx/dcbuffer.h
     wx/generic/calctrl.h

+    wx/generic/datectrl.h

     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h


@@ -2278,6 +2299,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wizard.h
 </set>
 
     wx/wizard.h
 </set>
 

+<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
+    wx/datectrl.h
+</set>
+

 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/sound.cpp
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/sound.cpp


@@ -2287,11 +2312,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>

+
+<!-- not used with wxUniv -->
+<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/datectrl.cpp
+</set>
+<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/datectrl.h
+</set>
+

 <!-- not built on WindowsCE: -->
 <!-- not built on WindowsCE: -->

-<set var="ADVANCED_MSW_ONLY_SRC" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">

     src/msw/joystick.cpp
 </set>
     src/msw/joystick.cpp
 </set>

-<set var="ADVANCED_MSW_ONLY_HDR" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">

     wx/msw/joystick.h
 </set>
 
     wx/msw/joystick.h
 </set>
 


@@ -2361,9 +2395,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_MSW_HDR" hints="files">
 </set>
 <!-- not built on WindowsCE: -->
 <set var="MEDIA_MSW_HDR" hints="files">
 </set>
 <!-- not built on WindowsCE: -->

-<set var="MEDIA_MSW_ONLY_SRC" hints="files">
+<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">

 </set>
 </set>

-<set var="MEDIA_MSW_ONLY_HDR" hints="files">
+<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">

 </set>
 
 <set var="MEDIA_MAC_SRC" hints="files">
 </set>
 
 <set var="MEDIA_MAC_SRC" hints="files">


@@ -2373,6 +2407,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_COCOA_SRC" hints="files">
 </set>
 
 <set var="MEDIA_COCOA_SRC" hints="files">

+    src/cocoa/mediactrl.mm

 </set>
 <set var="MEDIA_COCOA_HDR" hints="files">
 </set>
 </set>
 <set var="MEDIA_COCOA_HDR" hints="files">
 </set>


@@ -2383,6 +2418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_UNIX_SRC" hints="files">
 </set>
 
 <set var="MEDIA_UNIX_SRC" hints="files">

+    src/unix/mediactrl.cpp

 </set>
 <set var="MEDIA_UNIX_HDR" hints="files">
 </set>
 </set>
 <set var="MEDIA_UNIX_HDR" hints="files">
 </set>


@@ -2465,6 +2501,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_chckl.cpp
     src/xrc/xh_choic.cpp
     src/xrc/xh_combo.cpp
     src/xrc/xh_chckl.cpp
     src/xrc/xh_choic.cpp
     src/xrc/xh_combo.cpp

+    src/xrc/xh_datectrl.cpp

     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
     src/xrc/xh_gauge.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
     src/xrc/xh_gauge.cpp


@@ -2697,7 +2734,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>

-        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>

         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>


@@ -2720,7 +2757,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>

-        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>

         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>


@@ -2729,7 +2766,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>

-        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>

         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>


@@ -2747,7 +2784,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">

-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>

         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>


@@ -2757,7 +2794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">

-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>

         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>


@@ -2766,12 +2803,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>

-    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
-    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+
+    <!-- wxAdv files not used by wxUniv -->
+    <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+    </set>
+
+    <set var="ADVANCED_SRC" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+    </set>
+    <set var="ADVANCED_HDR" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+    </set>

 
     <!-- wxMedia files: -->
     <set var="MEDIA_PLATFORM_SRC" hints="files">
 
     <!-- wxMedia files: -->
     <set var="MEDIA_PLATFORM_SRC" hints="files">

-        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>

         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>


@@ -2781,7 +2833,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
     </set>
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
     </set>
     <set var="MEDIA_PLATFORM_HDR" hints="files">

-        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>

         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>