Destroy the wxDialog::ShowWindowModalThenDo() functor a.s.a.p.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bd105da81219fa5c0f578380818474ee3b5dfc85..a297dfcf8c334d60f6b80ea857689f80ec6ee9a1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <makefile>
 
 <!--
@@ -44,7 +43,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
      ====================================================================== -->
 
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+    </define-rule>
+</if>
 
 <!-- ====================================================================== -->
 <!--                               wxBase                                   -->
@@ -70,6 +72,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/timerunx.cpp
     src/unix/threadpsx.cpp
     src/unix/utilsunx.cpp
+    src/unix/wakeuppipe.cpp
     src/unix/fswatcher_kqueue.cpp
 </set>
 
@@ -355,6 +358,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
+    src/common/threadinfo.cpp
     src/common/time.cpp
     src/common/timercmn.cpp
     src/common/timerimpl.cpp
@@ -402,6 +406,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/clntdata.h
     wx/cmdargs.h
     wx/cmdline.h
+    wx/compiler.h
     wx/confbase.h
     wx/config.h
     wx/convauto.h
@@ -543,6 +548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/meta/int2type.h
     wx/meta/movable.h
     wx/meta/pod.h
+    wx/meta/removeref.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
 </set>
@@ -705,6 +711,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/markupparser.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp
+    src/common/modalhook.cpp
     src/common/mousemanager.cpp
     src/common/nbkbase.cpp
     src/common/overlaycmn.cpp
@@ -714,6 +721,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
+    src/common/preferencescmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/radiobtncmn.cpp
@@ -737,6 +745,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
     src/common/textentrycmn.cpp
+    src/common/textmeasurecmn.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/uiactioncmn.cpp
@@ -765,6 +774,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/msgdlgg.cpp
     src/generic/numdlgg.cpp
     src/generic/progdlgg.cpp
+    src/generic/preferencesg.cpp
     src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/richmsgdlgg.cpp
@@ -782,6 +792,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/treebkg.cpp
     src/generic/vlbox.cpp
     src/generic/vscroll.cpp
+    src/xrc/xmlreshandler.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
     wx/affinematrix2dbase.h
@@ -790,7 +801,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -860,6 +870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/listbox.h
     wx/mdi.h
     wx/menu.h
+    wx/modalhook.h
     wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
@@ -897,6 +908,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/valnum.h
     wx/window.h
     wx/windowid.h
+    wx/windowptr.h
     wx/withimages.h
     wx/wrapsizer.h
     wx/wupdlock.h
@@ -1011,6 +1023,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/vscroll.h
     wx/xpmdecod.h
     wx/xpmhand.h
+    wx/xrc/xmlreshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -1047,13 +1060,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxGTK                                   -->
 <!-- ====================================================================== -->
 
+<set var="GTK_WIN32_SRC" hints="files">
+    src/generic/caret.cpp
+    src/generic/imaglist.cpp
+    src/msw/ole/automtn.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/display.cpp
+    src/msw/utilswin.cpp
+    src/unix/fontenum.cpp
+    src/unix/fontutil.cpp
+</set>
+<set var="GTK_WIN32_HDR" hints="files">
+    wx/generic/caret.h
+    wx/generic/imaglist.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
+    wx/msw/ole/uuid.h
+    wx/msw/dib.h
+    wx/unix/fontutil.h
+</set>
 <set var="GTK_PLATFORM_SRC" hints="files">
     <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
     <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_SRC)</if>
 </set>
 <set var="GTK_PLATFORM_HDR" hints="files">
     <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
     <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_HDR)</if>
 </set>
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(GTK_PLATFORM_SRC)
@@ -1082,6 +1121,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/region.cpp
     src/gtk/renderer.cpp
     src/gtk/settings.cpp
+    src/gtk/textmeasure.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
     src/gtk/toplevel.cpp
@@ -1238,7 +1278,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/textctrl.h
     wx/gtk/textentry.h
     wx/gtk/tglbtn.h
-    wx/gtk/treeentry_gtk.h
 </set>
 <set var="GTK2_HDR" hints="files">
     $(GTK_HDR)
@@ -1255,6 +1294,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_SRC)
     src/generic/icon.cpp
     src/generic/paletteg.cpp
+    src/generic/textmeasure.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp
     src/gtk1/brush.cpp
@@ -1416,6 +1456,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MOTIF_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/textmeasure.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
     src/x11/palette.cpp
@@ -1581,6 +1622,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
     src/generic/icon.cpp
+    src/generic/textmeasure.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
@@ -1683,6 +1725,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/ole/dropsrc.cpp
     src/msw/ole/droptgt.cpp
     src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
@@ -1691,6 +1734,7 @@ 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/textmeasure.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/uiaction.cpp
@@ -1842,6 +1886,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/ole/dropsrc.h
     wx/msw/ole/droptgt.h
     wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
     wx/msw/ownerdrw.h
     wx/msw/palette.h
     wx/msw/panel.h
@@ -1890,7 +1935,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/pencil.cur
     wx/msw/pntleft.cur
     wx/msw/pntright.cur
-    wx/msw/rightarr.cur
     wx/msw/roller.cur
     <!-- icons -->
     wx/msw/cdrom.ico
@@ -1963,6 +2007,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/icon.cpp
     src/generic/imaglist.cpp
     src/generic/mask.cpp
+    src/generic/textmeasure.cpp
     src/dfb/app.cpp
     src/dfb/bitmap.cpp
     src/dfb/brush.cpp
@@ -2039,6 +2084,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/mdig.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
     <!-- OS/2 specific files: -->
     src/os2/accel.cpp
     src/os2/app.cpp
@@ -2314,6 +2360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </if>
 </set>
 
@@ -2498,6 +2545,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/cocoa/nonownedwnd.mm
     src/osx/cocoa/notebook.mm
     src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/preferences.mm
     src/osx/cocoa/printdlg.mm
     src/osx/cocoa/scrolbar.mm
     src/osx/cocoa/slider.mm
@@ -2656,6 +2704,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/paletteg.cpp
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -3134,13 +3183,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/animate.h
 </set>
 
+<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/sound.cpp
+</set>
+<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/sound.h
+    wx/msw/taskbar.h
+</set>
 <set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
     <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
     <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
 </set>
 <set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
     <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
     <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
 </set>
 <set var="ADVANCED_GTK_SRC" hints="files">
     $(ADVANCED_GTK_PLATFORM_SRC)
@@ -3190,7 +3251,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
-    src/generic/animateg.cpp
+<!--
+    Including src/generic/animateg.cpp hre unconditionally results in bakefile
+    errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
+-->
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='MSW'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='WINCE'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='X11'">
+        src/generic/animateg.cpp
+    </if>
 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h
@@ -3345,12 +3421,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_SRC_PLATFORM)
     src/common/webview.cpp
     src/common/webviewarchivehandler.cpp
+    src/common/webviewfshandler.cpp
 </set>
 
 <set var="WEBVIEW_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='MSW'">
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
+        wx/msw/webview_missing.h
     </if>
     <if cond="TOOLKIT=='GTK'">
         wx/gtk/webviewhistoryitem_webkit.h
@@ -3365,6 +3443,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_HDR_PLATFORM)
     wx/webview.h
     wx/webviewarchivehandler.h
+    wx/webviewfshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3412,8 +3491,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_propdlg.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
-    <!-- disabled until linking problems are fixed -->
-    <!-- src/xrc/xh_richtext.cpp -->
     src/xrc/xh_scrol.cpp
     src/xrc/xh_scwin.cpp
     src/xrc/xh_htmllbox.cpp
@@ -3482,7 +3559,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_propdlg.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
-    <!-- wx/xrc/xh_richtext.h -->
     wx/xrc/xh_scrol.h
     wx/xrc/xh_scwin.h
     wx/xrc/xh_htmllbox.h
@@ -3534,7 +3610,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
     <if cond="TOOLKIT=='OSX_IPHONE'">src/osx/iphone/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3' and PLATFORM_WIN32=='0'">
         src/unix/glx11.cpp
         src/gtk/glcanvas.cpp
     </if>
@@ -3616,6 +3692,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/xrc/xh_auinotbk.cpp
     $(AUI_GTK_SRC)
 </set>
 <set var="AUI_HDR" hints="files">
@@ -3627,6 +3704,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/xrc/xh_auinotbk.h
     $(AUI_GTK_HDR)
 </set>
 
@@ -3645,6 +3723,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/ribbon/page.cpp
     src/ribbon/panel.cpp
     src/ribbon/toolbar.cpp
+    src/xrc/xh_ribbon.cpp
 </set>
 <set var="RIBBON_HDR" hints="files">
     wx/ribbon/art.h
@@ -3656,6 +3735,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ribbon/page.h
     wx/ribbon/panel.h
     wx/ribbon/toolbar.h
+    wx/xrc/xh_ribbon.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3699,6 +3779,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/richtext/richtextstyles.cpp
     src/richtext/richtextsymboldlg.cpp
     src/richtext/richtextxml.cpp
+    src/xrc/xh_richtext.cpp
 </set>
 <set var="RICHTEXT_HDR" hints="files">
     wx/richtext/richtextbackgroundpage.h
@@ -3720,8 +3801,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/richtext/richtextstylepage.h
     wx/richtext/richtextstyles.h
     wx/richtext/richtextsymboldlg.h
+    wx/richtext/richtexttabspage.h
     wx/richtext/richtextuicustomization.h
     wx/richtext/richtextxml.h
+    wx/xrc/xh_richtext.h
 </set>
 
 
@@ -3830,8 +3913,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- GUI sources: -->
 
     <set var="LOWLEVEL_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
@@ -3866,8 +3949,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
 
     <set var="GUI_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
@@ -3879,8 +3962,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
@@ -3910,8 +3993,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
@@ -3924,8 +4007,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
@@ -3933,14 +4016,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- wxAdv files not used by wxUniv -->
     <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
     </set>