Add some missing wx. prefixes

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index edb5d50216fc32e508e571632f4e06e7c9681bc3..8414e076979669e877ae0d4b7d67c7a01ee3eb07 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -323,13 +323,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/gsockunx.h
 </set>
 
     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
 </set>
 <set var="NET_OS2_SRC" hints="files">
     src/os2/gsocket.c
 </set>


@@ -1031,6 +1024,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/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
     wx/x11/print.h
     wx/x11/private.h
     wx/x11/privx.h


@@ -1560,6 +1554,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/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
     src/mac/icon.cpp
     src/mac/listbox.cpp
     src/mac/mdi.cpp


@@ -1760,6 +1755,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/toolbar.mm

     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp


@@ -1780,6 +1776,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.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/NSBox.h
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSBox.h


@@ -1834,6 +1832,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/toolbar.h

     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->


@@ -2208,24 +2207,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
     <!-- wxNet files: -->
 
 
     <!-- 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>
     <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="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">
     </set>
 
     <set var="NET_SRC" hints="files">


@@ -2339,7 +2331,7 @@ 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)
         $(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>
 
         $(XML_SRC) $(ODBC_SRC)
     </set>