src/msw/dde.cpp
src/msw/dir.cpp
src/msw/dlmsw.cpp
+ src/msw/evtloopconsole.cpp
src/msw/mimetype.cpp
src/msw/power.cpp
src/msw/regconf.cpp
src/msw/fswatcher.cpp
</set>
<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
- src/msw/evtloop.cpp
src/msw/main.cpp
src/msw/mslu.cpp
src/msw/volume.cpp
wx/msw/crashrpt.h
wx/msw/dde.h
wx/msw/debughlp.h
+ wx/msw/evtloopconsole.h
wx/msw/gccpriv.h
wx/msw/libraries.h
wx/msw/mimetype.h
wx/osx/core/cfref.h
wx/osx/core/cfstring.h
wx/osx/core/hid.h
+ wx/osx/core/evtloop.h
+ wx/osx/core/objcid.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) -->
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">
<!-- wxGTK -->
<!-- ====================================================================== -->
+<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>
+</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>
+</set>
<set var="GTK_LOWLEVEL_SRC" hints="files">
- $(XWIN_LOWLEVEL_SRC)
+ $(GTK_PLATFORM_SRC)
src/generic/icon.cpp
src/generic/paletteg.cpp
src/gtk/app.cpp
src/gtk/cursor.cpp
src/gtk/dataobj.cpp
src/gtk/dc.cpp
- src/gtk/dcclient.cpp
- src/gtk/dcmemory.cpp
- src/gtk/dcscreen.cpp
src/gtk/dnd.cpp
src/gtk/evtloop.cpp
src/gtk/filectrl.cpp
src/gtk/win_gtk.cpp
src/gtk/window.cpp
</set>
+<set var="GTK2_LOWLEVEL_SRC" hints="files">
+ $(GTK_LOWLEVEL_SRC)
+ src/gtk/dcclient.cpp
+ src/gtk/dcmemory.cpp
+ src/gtk/dcscreen.cpp
+</set>
<set var="GTK_LOWLEVEL_HDR" hints="files">
- $(XWIN_LOWLEVEL_HDR)
+ $(GTK_PLATFORM_HDR)
wx/generic/icon.h
wx/generic/paletteg.h
wx/gtk/app.h
wx/gtk/dataform.h
wx/gtk/dataobj.h
wx/gtk/dataobj2.h
- wx/gtk/dc.h
- wx/gtk/dcclient.h
- wx/gtk/dcmemory.h
- wx/gtk/dcscreen.h
wx/gtk/dnd.h
wx/gtk/evtloop.h
wx/gtk/evtloopsrc.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
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- <!-- Generic implementations used by wxGPE: -->
- src/generic/fontdlgg.cpp
<!-- GTK+ specific files: -->
src/gtk/anybutton.cpp
src/gtk/artgtk.cpp
src/gtk/fontdlg.cpp
src/gtk/frame.cpp
src/gtk/gauge.cpp
- src/gtk/gnome/gprint.cpp
src/gtk/gnome/gvfs.cpp
src/gtk/infobar.cpp
src/gtk/listbox.cpp
src/gtk/tglbtn.cpp
src/gtk/treeentry_gtk.c
</set>
+<set var="GTK2_SRC" hints="files">
+ $(GTK_SRC)
+ <!-- Generic implementations used by wxGPE: -->
+ src/generic/fontdlgg.cpp
+ <!-- GTK+ specific files: -->
+ src/gtk/gnome/gprint.cpp
+</set>
<set var="GTK_HDR" hints="files">
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
- wx/generic/fontdlgg.h
wx/generic/listctrl.h
wx/generic/statusbr.h
wx/gtk/accel.h
wx/gtk/fontdlg.h
wx/gtk/frame.h
wx/gtk/gauge.h
- wx/gtk/gnome/gprint.h
wx/gtk/gnome/gvfs.h
wx/gtk/infobar.h
wx/gtk/listbox.h
wx/gtk/tglbtn.h
wx/gtk/treeentry_gtk.h
</set>
+<set var="GTK2_HDR" hints="files">
+ $(GTK_HDR)
+ wx/generic/fontdlgg.h
+ wx/gtk/gnome/gprint.h
+</set>
<!-- ====================================================================== -->
src/msw/toplevel.cpp
src/msw/uiaction.cpp
src/msw/utilsgui.cpp
+ src/msw/utilswin.cpp
src/msw/uxtheme.cpp
src/msw/window.cpp
</set>
src/msw/dialog.cpp
src/msw/dirdlg.cpp
src/msw/dragimag.cpp
+ src/msw/evtloop.cpp
src/msw/filedlg.cpp
src/msw/frame.cpp
src/msw/gauge.cpp
wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
+ wx/msw/init.h
wx/msw/listbox.h
wx/msw/listctrl.h
wx/msw/mdi.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/generic/animate.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>
+</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>
+</set>
<set var="ADVANCED_GTK_SRC" hints="files">
+ $(ADVANCED_GTK_PLATFORM_SRC)
+ src/gtk/notifmsg.cpp
src/gtk/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK2_SRC" hints="files">
+ $(ADVANCED_GTK_SRC)
src/gtk/eggtrayicon.c
src/gtk/hildon/notifmsg.cpp
</set>
<set var="ADVANCED_GTK_HDR" hints="files">
- wx/gtk/hildon/notifmsg.h
+ $(ADVANCED_GTK_PLATFORM_HDR)
+ wx/gtk/notifmsg.h
wx/gtk/taskbar.h
</set>
+<set var="ADVANCED_GTK2_HDR" hints="files">
+ $(ADVANCED_GTK_HDR)
+ wx/gtk/hildon/notifmsg.h
+</set>
<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
src/gtk/aboutdlg.cpp
</set>
<set var="MEDIA_OSX_COCOA_SRC" hints="files">
- <!-- src/osx/cocoa/mediactrl.mm -->
+ src/osx/cocoa/mediactrl.mm
</set>
<set var="MEDIA_OSX_COCOA_HDR" hints="files">
</set>
<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'">
+ src/unix/glx11.cpp
+ src/gtk/glcanvas.cpp
+ </if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/gtk/glcanvas.cpp
src/unix/glx11.cpp
<if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h</if>
<if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if>
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">
+ wx/gtk/glcanvas.h
+ wx/unix/glx11.h
+ </if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
wx/gtk/glcanvas.h
wx/unix/glx11.h
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+ <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==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
</set>
<set var="LOWLEVEL_HDR" hints="files">
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
</set>
<set var="GUI_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
+ <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==''">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<set var="GUI_HDR" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+ <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==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<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=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_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==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
<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=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_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==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
<!-- 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=='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=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>