X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afc89ff455aeff7b156273726e62c3c90f197687..0e795b059775a8cfca51f08c9ae5c76c619a610b:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b38075c69d..8ab26e3520 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -62,6 +62,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
+    src/unix/timerunx.cpp
 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp
@@ -95,6 +96,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/stackwalk.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.cpp
+    src/msw/timer.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
 </set>
@@ -201,6 +203,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/dlunix.cpp
     src/unix/snglinst.cpp
     src/unix/stdpaths.cpp
+    src/unix/timerunx.cpp
 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">
     $(BASE_MAC_HDR)
@@ -342,11 +345,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/stream.cpp
     src/common/string.cpp
     src/common/stringimpl.cpp
+    src/common/stringops.cpp
     src/common/strvararg.cpp
     src/common/sysopt.cpp
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
+    src/common/timercmn.cpp
+    src/common/timerimpl.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
     src/common/unichar.cpp
@@ -458,6 +464,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/stream.h
     wx/string.h
     wx/stringimpl.h
+    wx/stringops.h
     wx/strvararg.h
     wx/sysopt.h
     wx/tarstrm.h
@@ -480,6 +487,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wx.h
     wx/wxchar.h
     wx/wxcrt.h
+    wx/wxcrtvararg.h
     wx/wxprec.h
     wx/xti.h
     wx/xtistrm.h
@@ -658,7 +666,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
-    src/common/timercmn.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp
@@ -756,7 +763,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splitter.h
     wx/generic/srchctlg.h
     wx/generic/textdlgg.h
-    wx/generic/timer.h
     wx/generic/treectlg.h
     wx/graphics.h
     wx/helphtml.h
@@ -980,7 +986,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/region.h
-    wx/gtk/timer.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/win_gtk.h
@@ -1159,7 +1164,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
     wx/gtk1/region.h
-    wx/gtk1/timer.h
     wx/gtk1/tooltip.h
     wx/gtk1/toplevel.h
     wx/gtk1/win_gtk.h
@@ -1401,7 +1405,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/stattext.h
     wx/motif/textctrl.h
     wx/motif/tglbtn.h
-    wx/motif/timer.h
     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h
@@ -1528,7 +1531,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
-    src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
@@ -1680,7 +1682,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tbar95.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
-    wx/msw/timer.h
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
@@ -1808,7 +1809,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h
-    wx/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
@@ -1873,7 +1873,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h
-    wx/generic/timer.h
     wx/dfb/app.h
     wx/dfb/bitmap.h
     wx/dfb/brush.h
@@ -2058,7 +2057,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/tabctrl.h
     wx/os2/textctrl.h
     wx/os2/tglbtn.h
-    wx/os2/timer.h
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
@@ -2264,7 +2262,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/tabctrl.h
     wx/mac/taskbarosx.h
     wx/mac/textctrl.h
-    wx/mac/timer.h
     wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
@@ -2350,7 +2347,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/statusbr.h
     wx/mac/carbon/tabctrl.h
     wx/mac/carbon/textctrl.h
-    wx/mac/carbon/timer.h
     wx/mac/carbon/tglbtn.h
     wx/mac/carbon/toolbar.h
     wx/mac/carbon/tooltip.h
@@ -2538,7 +2534,6 @@ 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/timer.h
     wx/cocoa/toolbar.h
     wx/cocoa/tooltip.h
     wx/cocoa/toplevel.h
@@ -2682,7 +2677,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/calctrl.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
-<!--     src/generic/editlbox.cpp -->
+    src/generic/editlbox.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
@@ -2698,6 +2693,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">
+    wx/aboutdlg.h
     wx/animate.h
     wx/animdecod.h
     wx/bmpcbox.h
@@ -2705,8 +2701,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
-<!--     wx/editlbox.h -->
-    wx/aboutdlg.h
+    wx/editlbox.h
     wx/generic/aboutdlgg.h
     wx/generic/animate.h
     wx/generic/bmpcbox.h
@@ -3107,12 +3102,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/glcmn.cpp
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/gtk/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        src/gtk1/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
@@ -3124,12 +3125,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OPENGL_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/gtk/glcanvas.h
+        wx/unix/glx11.h
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        wx/gtk1/glcanvas.h
+        wx/unix/glx11.h
+    </if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
-    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
 </set>
 
 <set var="OPENGL_HDR" hints="files">