Remove another unneeded TOOLKIT test from the bakefiles.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 00ec5612cca031374fec93cc3476cf404f9bda30..1e08f1cd5e4293e6476ebd80db3f1f58888ae7da 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -197,9 +197,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h

+    wx/osx/core/objcid.h

     wx/osx/core/private.h
     wx/osx/core/stdpaths.h
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h

-    wx/osx/core/private/strconv_cf.h

 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->


@@ -564,7 +564,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">

-    wx/msw/private/sockmsw.h

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


@@ -1109,7 +1108,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/nonownedwnd.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/nonownedwnd.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h

-    wx/gtk/private/win_gtk.h

     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h


@@ -1837,7 +1835,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/rcdefs.h
     wx/msw/richmsgdlg.h
     wx/msw/scrolbar.h
     wx/msw/rcdefs.h
     wx/msw/richmsgdlg.h
     wx/msw/scrolbar.h

-    wx/msw/setup0.h

     wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
     wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h


@@ -2156,7 +2153,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/region.h
     wx/os2/scrolbar.h
     wx/os2/settings.h
     wx/os2/region.h
     wx/os2/scrolbar.h
     wx/os2/settings.h

-    wx/os2/setup0.h

     wx/os2/slider.h
     wx/os2/spinbutt.h
     wx/os2/spinctrl.h
     wx/os2/slider.h
     wx/os2/spinbutt.h
     wx/os2/spinctrl.h


@@ -2454,9 +2450,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h

-    wx/osx/carbon/private/mactext.h
-    wx/osx/carbon/private/overlay.h
-    wx/osx/carbon/private/print.h

     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h
     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h


@@ -3296,7 +3289,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="WEBVIEW_SRC_PLATFORM">
     <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
 
 <set var="WEBVIEW_SRC_PLATFORM">
     <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>

-    <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>

     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
 </set>
 <set var="WEBVIEW_SRC" hints="files">
     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
 </set>
 <set var="WEBVIEW_SRC" hints="files">


@@ -3310,7 +3303,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
     </if>
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
     </if>

-    <if cond="PLATFORM_UNIX=='1'">
+    <if cond="TOOLKIT=='GTK'">

         wx/gtk/webviewhistoryitem_webkit.h
         wx/gtk/webview_webkit.h
     </if>
         wx/gtk/webviewhistoryitem_webkit.h
         wx/gtk/webview_webkit.h
     </if>


@@ -3548,6 +3541,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                  wxAUI                                 -->
 <!-- ====================================================================== -->
 
 <!--                                  wxAUI                                 -->
 <!-- ====================================================================== -->
 

+<set var="AUI_GTK_SRC" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/aui/tabartgtk.cpp
+    </if>
+</set>
+<set var="AUI_GTK_HDR" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/aui/tabartgtk.h
+    </if>
+</set>

 <set var="AUI_SRC" hints="files">
     src/aui/framemanager.cpp
     src/aui/dockart.cpp
 <set var="AUI_SRC" hints="files">
     src/aui/framemanager.cpp
     src/aui/dockart.cpp


@@ -3556,6 +3559,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/aui/auibar.cpp
     src/aui/tabmdi.cpp
     src/aui/tabart.cpp
     src/aui/auibar.cpp
     src/aui/tabmdi.cpp
     src/aui/tabart.cpp

+    $(AUI_GTK_SRC)

 </set>
 <set var="AUI_HDR" hints="files">
     wx/aui/framemanager.h
 </set>
 <set var="AUI_HDR" hints="files">
     wx/aui/framemanager.h


@@ -3566,6 +3570,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/tabmdi.h
     wx/aui/aui.h
     wx/aui/tabart.h
     wx/aui/tabmdi.h
     wx/aui/aui.h
     wx/aui/tabart.h

+    $(AUI_GTK_HDR)

 </set>
 
 <!-- ====================================================================== -->
 </set>
 
 <!-- ====================================================================== -->