X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd133a2044aff696fd59a30acdd026090bee4b0c..7e6f48d18c6173e0655120e50b66dace36f2d1c6:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 2dcc13e3fe..0f3640eb04 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -136,7 +136,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
-    src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
@@ -205,7 +204,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
-    wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
@@ -217,6 +215,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/debug.h
     wx/defs.h
     wx/dir.h
+    wx/dlimpexp.h
     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h
@@ -310,6 +309,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.c
+    src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     wx/msw/gsockmsw.h
@@ -322,15 +322,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/gsockunx.h
 </set>
 
-<set var="NET_MAC_SRC" hints="files">
-    src/mac/gsocket.c
-</set>
-<set var="NET_MAC_HDR" hints="files">
-    wx/mac/gsockmac.h
-</set>
-
 <set var="NET_OS2_SRC" hints="files">
-    src/os2/gsocket.c
+    src/unix/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
     wx/unix/gsockunx.h
@@ -377,6 +370,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
+    src/common/clntdata.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -399,6 +393,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/fontmap.cpp
     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
+    src/common/gbsizer.cpp
     src/common/gdicmn.cpp
     src/common/geometry.cpp
     src/common/gifdecod.cpp
@@ -471,6 +466,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
+    wx/clntdata.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h
@@ -488,6 +484,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/filedlg.h
     wx/frame.h
     wx/gauge.h
+    wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
     wx/generic/choicdgg.h
@@ -500,6 +497,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/imaglist.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
+    wx/generic/numdlgg.h
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
@@ -518,6 +516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/numdlg.h
     wx/palette.h
     wx/panel.h
     wx/pen.h
@@ -709,6 +708,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
+    <!-- Generic implementations used by wxGPE: -->
+    src/generic/fontdlgg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
@@ -868,6 +869,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/minifram.cpp
     src/motif/msgdlg.cpp
     src/motif/palette.cpp
+    src/motif/popupwin.cpp
     src/motif/radiobox.cpp
     src/motif/radiobut.cpp
     src/motif/scrolbar.cpp
@@ -924,6 +926,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/cursor.h
     wx/motif/dataform.h
     wx/motif/dataobj.h
+    wx/motif/dataobj2.h
     wx/motif/dc.h
     wx/motif/dcclient.h
     wx/motif/dcmemory.h
@@ -944,6 +947,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/minifram.h
     wx/motif/msgdlg.h
     wx/motif/palette.h
+    wx/motif/popupwin.h
     wx/motif/print.h
     wx/motif/private.h
     wx/motif/radiobox.h
@@ -1026,6 +1030,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
+    wx/x11/popupwin.h
     wx/x11/print.h
     wx/x11/private.h
     wx/x11/privx.h
@@ -1546,6 +1551,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/dcscreen.cpp
     src/mac/dialog.cpp
     src/mac/dirdlg.cpp
+    src/mac/display.cpp
     src/mac/dnd.cpp
     src/mac/filedlg.cpp
     src/mac/font.cpp
@@ -1555,6 +1561,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/frame.cpp
     src/mac/gauge.cpp
     src/mac/gdiobj.cpp
+    src/mac/gsockosx.c
     src/mac/icon.cpp
     src/mac/listbox.cpp
     src/mac/mdi.cpp
@@ -1585,6 +1592,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/tabctrl.cpp
     src/mac/textctrl.cpp
     src/mac/timer.cpp
+    src/mac/tglbtn.cpp
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/toplevel.cpp
@@ -1629,6 +1637,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
+    wx/mac/display.h
     wx/mac/dnd.h
     wx/mac/filedlg.h
     wx/mac/font.h
@@ -1674,6 +1683,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/tabctrl.h
     wx/mac/textctrl.h
     wx/mac/timer.h
+    wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
     wx/mac/toplevel.h
@@ -1729,16 +1739,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
+    src/cocoa/evtloop.mm
     src/cocoa/font.cpp
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/gauge.mm
     src/cocoa/gdiobj.cpp
-    src/cocoa/icon.cpp
+    src/cocoa/icon.mm
     src/cocoa/listbox.mm
     src/cocoa/main.cpp
     src/cocoa/mbarman.mm
+    src/cocoa/mdi.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
     src/cocoa/pen.mm
@@ -1753,6 +1765,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/toolbar.mm
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
@@ -1767,15 +1780,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
-    src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/notebook.cpp
     src/generic/paletteg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
+    <!-- wxMac stuff used by wxCocoa: -->
+    src/mac/gsockosx.c
 </set>
 <set var="COCOA_HDR" hints="files">
+    wx/cocoa/NSApplication.h
     wx/cocoa/NSBox.h
     wx/cocoa/NSButton.h
     wx/cocoa/NSControl.h
@@ -1815,27 +1830,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
     wx/cocoa/mbarman.h
+    wx/cocoa/mdi.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
     wx/cocoa/pen.h
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
+    wx/cocoa/slider.h
     wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
+    wx/cocoa/toolbar.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
+    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
-    wx/generic/mdig.h
     wx/generic/paletteg.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
@@ -1957,7 +1975,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp
-    src/generic/dcbuffer.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
@@ -1985,6 +2002,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/joystick.h
     wx/laywin.h
     wx/sashwin.h
+    wx/sound.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
@@ -1995,43 +2013,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/joystick.cpp
+    src/msw/sound.cpp
     src/msw/taskbar.cpp
-    src/msw/wave.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
     wx/msw/joystick.h
+    wx/msw/sound.h
     wx/msw/taskbar.h
-    wx/msw/wave.h
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
     src/mac/joystick.cpp
-    src/mac/wave.cpp
+    src/mac/sound.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
     wx/mac/joystick.h
-    wx/mac/wave.h
+    wx/mac/sound.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
     src/os2/joystick.cpp
-    src/os2/wave.cpp
+    src/os2/sound.cpp
 </set>
 <set var="ADVANCED_OS2_HDR" hints="files">
     wx/os2/joystick.h
-    wx/os2/wave.h
+    wx/os2/sound.h
 </set>
 
 <set var="ADVANCED_UNIX_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/unix/joystick.cpp
+    src/unix/sound.cpp
     src/unix/taskbarx11.cpp
-    src/unix/wave.cpp
 </set>
 <set var="ADVANCED_UNIX_HDR" hints="files">
     wx/unix/joystick.h
+    wx/unix/sound.h
     wx/unix/taskbarx11.h
-    wx/unix/wave.h
 </set>
 
 
@@ -2043,6 +2061,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MSW'">
         src/msw/helpbest.cpp
     </if>
+    <if cond="PLATFORM_UNIX=='1'">
+        src/html/chm.cpp
+    </if>
+    <if cond="PLATFORM_MACOSX=='1'">
+        src/html/chm.cpp
+    </if>
 </set>
 <set var="HTML_SRC" hints="files">
     $(HTML_SRC_PLATFORM)
@@ -2151,6 +2175,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
+<!-- ====================================================================== -->
+<!--                             Misc plugin sources:                       -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SOUND_SRC_SDL" hints="files">
+    src/unix/sound_sdl.cpp
+</set>
 
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
@@ -2196,24 +2227,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
     <!-- wxNet files: -->
-    <set var="NET_MACOSX_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
-        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
-    </set>
     <set var="NET_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -2327,8 +2351,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_DARWIN_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
-        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC)
         $(XML_SRC) $(ODBC_SRC)
     </set>
-
+    
+    
+    
+    <!-- ================================================================ -->
+    <!--        Define where plugins sources go if USE_PLUGINS=0          -->
+    <!-- ================================================================ -->
+
+    <!-- wxAdv sources -->
+    <set var="PLUGIN_ADV_SRC">
+        <if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
+            $(UNIX_SOUND_SRC_SDL)
+        </if>
+    </set>
+    
+    <set var="PLUGIN_MONOLIB_SRC">$(PLUGIN_ADV_SRC)</set>
+    
 </makefile>