Move wxAdv library contents into wxCore
This basically removes the "adv" library, even though it's still preserved for compatibility with user make/project files referring to it. It is done because the distinction between "adv" and "core" was never really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in adv?) and it prevented some core classes from using adv ones.
This commit is contained in:
Vadim Zeitlin
6567
Makefile.in
6567
Makefile.in
File diff suppressed because it is too large
Load Diff
108
autoconf_inc.m4
108
autoconf_inc.m4
@@ -356,36 +356,18 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0[../../sa
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4)
|
||||
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
@@ -452,36 +434,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../de
|
||||
COND_PLATFORM_UNIX_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4)
|
||||
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
@@ -530,36 +494,18 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl]
|
||||
COND_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_SHARED_0)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4)
|
||||
dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
@@ -668,12 +614,6 @@ dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demo
|
||||
COND_TOOLKIT_COCOA=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_COCOA)
|
||||
dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1[wx.bkl] ###
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_DFB[wx.bkl] ###
|
||||
COND_TOOLKIT_DFB="#"
|
||||
if test "x$TOOLKIT" = "xDFB" ; then
|
||||
@@ -722,18 +662,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1[wx.
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
@@ -752,12 +680,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0[wx.
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
@@ -776,12 +698,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0[wx.
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
|
||||
@@ -860,6 +776,12 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_WXUNIV_0[../../samples/widgets/widgets.bkl] ###
|
||||
COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then
|
||||
@@ -890,12 +812,6 @@ dnl ### begin block 20_COND_TOOLKIT_QT[wx.bkl] ###
|
||||
COND_TOOLKIT_QT=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_QT)
|
||||
dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1[wx.bkl] ###
|
||||
COND_TOOLKIT_QT_USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_QT_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
|
||||
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
@@ -926,12 +842,6 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1[wx.bkl] ###
|
||||
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1)
|
||||
dnl ### begin block 20_COND_TOOLKIT_X11_WXUNIV_1[wx.bkl] ###
|
||||
COND_TOOLKIT_X11_WXUNIV_1="#"
|
||||
if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
|
||||
COND_TOOLKIT_X11_WXUNIV_1=""
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_X11_WXUNIV_1)
|
||||
dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
@@ -1112,12 +1022,6 @@ dnl ### begin block 20_COND_WITH_PLUGIN_SDL_1[wx.bkl] ###
|
||||
COND_WITH_PLUGIN_SDL_1=""
|
||||
fi
|
||||
AC_SUBST(COND_WITH_PLUGIN_SDL_1)
|
||||
dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
|
||||
COND_WXUNIV_0="#"
|
||||
if test "x$WXUNIV" = "x0" ; then
|
||||
COND_WXUNIV_0=""
|
||||
fi
|
||||
AC_SUBST(COND_WXUNIV_0)
|
||||
dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
|
||||
@@ -329,6 +329,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/clrpickerg.h
|
||||
wx/generic/fontpickerg.h
|
||||
wx/generic/caret.h
|
||||
wx/qt/calctrl.h
|
||||
wx/generic/animate.h
|
||||
wx/qt/dvrenderer.h
|
||||
wx/qt/taskbar.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/qt/dataview.h
|
||||
wx/qt/dvrenderers.h
|
||||
</set>
|
||||
|
||||
<set var="QT_SRC" hints="files">
|
||||
@@ -420,31 +427,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/qt/uiaction.cpp
|
||||
src/qt/utils.cpp
|
||||
src/qt/window.cpp
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_QT_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/qt/calctrl.h
|
||||
wx/qt/dataview.h
|
||||
wx/qt/dvrenderer.h
|
||||
wx/qt/dvrenderers.h
|
||||
wx/qt/taskbar.h
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_QT_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/qt/calctrl.cpp
|
||||
src/qt/converter.cpp
|
||||
src/qt/dataview.cpp
|
||||
src/qt/dvrenderer.cpp
|
||||
src/qt/dvrenderers.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/unix/sound.cpp
|
||||
src/qt/taskbar.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/qt/utils.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/qt/taskbar.cpp
|
||||
src/qt/dvrenderer.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/qt/dataview.cpp
|
||||
src/unix/sound.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/qt/calctrl.cpp
|
||||
src/qt/dvrenderers.cpp
|
||||
</set>
|
||||
|
||||
<set var="MEDIA_QT_SRC" hints="files">
|
||||
@@ -956,6 +948,41 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/vlbox.cpp
|
||||
src/generic/vscroll.cpp
|
||||
src/xrc/xmlreshandler.cpp
|
||||
src/generic/splash.cpp
|
||||
src/generic/notifmsgg.cpp
|
||||
src/generic/odcombo.cpp
|
||||
src/common/calctrlcmn.cpp
|
||||
src/generic/grideditors.cpp
|
||||
src/common/bmpcboxcmn.cpp
|
||||
src/generic/grid.cpp
|
||||
src/generic/gridctrl.cpp
|
||||
src/generic/hyperlinkg.cpp
|
||||
src/generic/helpext.cpp
|
||||
src/generic/sashwin.cpp
|
||||
src/generic/gridsel.cpp
|
||||
src/common/addremovectrl.cpp
|
||||
src/generic/tipdlg.cpp
|
||||
src/generic/aboutdlgg.cpp
|
||||
src/common/gridcmn.cpp
|
||||
src/common/richtooltipcmn.cpp
|
||||
src/generic/datectlg.cpp
|
||||
src/generic/bannerwindow.cpp
|
||||
src/generic/treelist.cpp
|
||||
src/common/datavcmn.cpp
|
||||
src/common/animatecmn.cpp
|
||||
src/common/odcombocmn.cpp
|
||||
src/common/hyperlnkcmn.cpp
|
||||
src/generic/propdlg.cpp
|
||||
src/generic/bmpcboxg.cpp
|
||||
src/generic/richtooltipg.cpp
|
||||
src/generic/timectrlg.cpp
|
||||
src/generic/commandlinkbuttong.cpp
|
||||
src/common/notifmsgcmn.cpp
|
||||
src/generic/wizard.cpp
|
||||
src/generic/datavgen.cpp
|
||||
src/generic/editlbox.cpp
|
||||
src/generic/laywin.cpp
|
||||
src/generic/calctrlg.cpp
|
||||
</set>
|
||||
<set var="GUI_CMN_HDR" hints="files">
|
||||
wx/affinematrix2dbase.h
|
||||
@@ -1194,6 +1221,57 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/collheaderctrl.h
|
||||
wx/itemattr.h
|
||||
wx/peninfobase.h
|
||||
wx/dataview.h
|
||||
wx/generic/helpext.h
|
||||
wx/sashwin.h
|
||||
wx/tipdlg.h
|
||||
wx/generic/propdlg.h
|
||||
wx/generic/bmpcbox.h
|
||||
wx/datetimectrl.h
|
||||
wx/grid.h
|
||||
wx/generic/grid.h
|
||||
wx/wizard.h
|
||||
wx/generic/grideditors.h
|
||||
wx/generic/dataview.h
|
||||
wx/generic/wizard.h
|
||||
wx/generic/dvrenderers.h
|
||||
wx/dateevt.h
|
||||
wx/editlbox.h
|
||||
wx/splash.h
|
||||
wx/bmpcbox.h
|
||||
wx/generic/gridctrl.h
|
||||
wx/addremovectrl.h
|
||||
wx/generic/notifmsg.h
|
||||
wx/odcombo.h
|
||||
wx/animate.h
|
||||
wx/generic/hyperlink.h
|
||||
wx/dcbuffer.h
|
||||
wx/joystick.h
|
||||
wx/timectrl.h
|
||||
wx/hyperlink.h
|
||||
wx/generic/aboutdlgg.h
|
||||
wx/taskbar.h
|
||||
wx/generic/timectrl.h
|
||||
wx/commandlinkbutton.h
|
||||
wx/richtooltip.h
|
||||
wx/sound.h
|
||||
wx/generic/laywin.h
|
||||
wx/generic/splash.h
|
||||
wx/generic/calctrlg.h
|
||||
wx/generic/sashwin.h
|
||||
wx/treelist.h
|
||||
wx/notifmsg.h
|
||||
wx/datectrl.h
|
||||
wx/laywin.h
|
||||
wx/generic/gridsel.h
|
||||
wx/aboutdlg.h
|
||||
wx/dvrenderers.h
|
||||
wx/generic/datectrl.h
|
||||
wx/bannerwindow.h
|
||||
wx/activityindicator.h
|
||||
wx/generic/dvrenderer.h
|
||||
wx/calctrl.h
|
||||
wx/propdlg.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@@ -1217,12 +1295,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/unix/fontutil.cpp
|
||||
src/unix/uiactionx11.cpp
|
||||
src/unix/utilsx11.cpp
|
||||
src/unix/sound.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/unix/taskbarx11.cpp
|
||||
</set>
|
||||
<set var="XWIN_LOWLEVEL_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
wx/generic/imaglist.h
|
||||
wx/unix/fontutil.h
|
||||
wx/unix/utilsx11.h
|
||||
wx/unix/sound.h
|
||||
wx/unix/taskbarx11.h
|
||||
wx/unix/joystick.h
|
||||
</set>
|
||||
|
||||
|
||||
@@ -1244,6 +1329,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/msw/utilswin.cpp
|
||||
src/unix/fontenum.cpp
|
||||
src/unix/fontutil.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/joystick.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
</set>
|
||||
<set var="GTK_WIN32_HDR" hints="files">
|
||||
wx/generic/caret.h
|
||||
@@ -1255,6 +1343,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/msw/ole/uuid.h
|
||||
wx/msw/dib.h
|
||||
wx/unix/fontutil.h
|
||||
wx/msw/sound.h
|
||||
wx/msw/joystick.h
|
||||
wx/msw/taskbar.h
|
||||
</set>
|
||||
<set var="GTK_PLATFORM_SRC" hints="files">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
|
||||
@@ -1394,11 +1485,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/gtk/textentry.cpp
|
||||
src/gtk/tglbtn.cpp
|
||||
src/gtk/treeentry_gtk.c
|
||||
src/gtk/activityindicator.cpp
|
||||
src/gtk/calctrl.cpp
|
||||
src/gtk/hyperlink.cpp
|
||||
src/gtk/aboutdlg.cpp
|
||||
src/gtk/notifmsg.cpp
|
||||
src/gtk/taskbar.cpp
|
||||
src/gtk/dataview.cpp
|
||||
src/gtk/bmpcbox.cpp
|
||||
src/gtk/animate.cpp
|
||||
</set>
|
||||
<set var="GTK2_SRC" hints="files">
|
||||
$(GTK_SRC)
|
||||
<!-- Generic implementations used by wxGPE: -->
|
||||
src/generic/fontdlgg.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/gtk/eggtrayicon.c
|
||||
</set>
|
||||
<set var="GTK_HDR" hints="files">
|
||||
wx/generic/fdrepdlg.h
|
||||
@@ -1451,6 +1553,16 @@ 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/animate.h
|
||||
wx/gtk/hyperlink.h
|
||||
wx/gtk/taskbar.h
|
||||
wx/gtk/dvrenderers.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/gtk/activityindicator.h
|
||||
wx/gtk/calctrl.h
|
||||
wx/gtk/bmpcbox.h
|
||||
wx/gtk/dataview.h
|
||||
wx/gtk/dvrenderer.h
|
||||
</set>
|
||||
<set var="GTK2_HDR" hints="files">
|
||||
$(GTK_HDR)
|
||||
@@ -1572,6 +1684,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/gtk1/toolbar.cpp
|
||||
src/gtk1/textctrl.cpp
|
||||
src/gtk1/tglbtn.cpp
|
||||
src/gtk1/taskbar.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/gtk1/eggtrayicon.c
|
||||
src/generic/animateg.cpp
|
||||
</set>
|
||||
<set var="GTK1_HDR" hints="files">
|
||||
wx/generic/clrpickerg.h
|
||||
@@ -1619,6 +1735,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/gtk1/textctrl.h
|
||||
wx/gtk1/tglbtn.h
|
||||
wx/gtk1/treectrl.h
|
||||
wx/generic/animate.h
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
|
||||
|
||||
@@ -1713,6 +1831,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/statline.cpp
|
||||
src/generic/statusbr.cpp
|
||||
src/generic/tabg.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
</set>
|
||||
<set var="MOTIF_HDR" hints="files">
|
||||
wx/generic/clrpickerg.h
|
||||
@@ -1783,6 +1903,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/motif/toolbar.h
|
||||
wx/motif/toplevel.h
|
||||
wx/motif/window.h
|
||||
wx/generic/animate.h
|
||||
wx/generic/animateanimate.h
|
||||
</set>
|
||||
|
||||
|
||||
@@ -1917,6 +2039,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/msw/window.cpp
|
||||
src/msw/graphicsd2d.cpp
|
||||
src/msw/rt/utilsrt.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/msw/helpchm.cpp
|
||||
src/msw/taskbar.cpp
|
||||
src/msw/helpwin.cpp
|
||||
src/msw/joystick.cpp
|
||||
src/msw/aboutdlg.cpp
|
||||
src/msw/notifmsg.cpp
|
||||
src/msw/richtooltip.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/ole/automtn.cpp
|
||||
src/msw/rt/notifmsgrt.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/msw/ole/uuid.cpp
|
||||
</set>
|
||||
<set var="MSW_LOWLEVEL_HDR" hints="files">
|
||||
wx/msw/nonownedwnd.h
|
||||
@@ -1924,18 +2059,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/msw/popupwin.h
|
||||
wx/msw/uxtheme.h
|
||||
wx/msw/htmlhelp.h
|
||||
</set>
|
||||
|
||||
<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
|
||||
src/msw/helpchm.cpp
|
||||
src/msw/helpwin.cpp
|
||||
src/msw/ole/automtn.cpp
|
||||
src/msw/ole/uuid.cpp
|
||||
</set>
|
||||
|
||||
<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">
|
||||
wx/msw/helpchm.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/msw/helpwin.h
|
||||
wx/msw/taskbar.h
|
||||
wx/msw/helpchm.h
|
||||
wx/msw/sound.h
|
||||
wx/msw/joystick.h
|
||||
</set>
|
||||
|
||||
<set var="MSW_SRC" hints="files">
|
||||
@@ -1999,6 +2128,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/msw/treectrl.cpp
|
||||
src/msw/systhemectrl.cpp
|
||||
src/msw/customdraw.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/msw/commandlinkbutton.cpp
|
||||
src/msw/bmpcbox.cpp
|
||||
src/msw/hyperlink.cpp
|
||||
src/msw/calctrl.cpp
|
||||
src/msw/datectrl.cpp
|
||||
src/msw/datetimectrl.cpp
|
||||
src/msw/timectrl.cpp
|
||||
src/msw/datecontrols.cpp
|
||||
</set>
|
||||
<set var="MSW_HDR" hints="files">
|
||||
wx/generic/clrpickerg.h
|
||||
@@ -2098,6 +2236,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/msw/treectrl.h
|
||||
wx/msw/window.h
|
||||
wx/msw/rt/utils.h
|
||||
wx/msw/hyperlink.h
|
||||
wx/msw/bmpcbox.h
|
||||
wx/generic/animate.h
|
||||
wx/msw/commandlinkbutton.h
|
||||
wx/msw/datetimectrl.h
|
||||
wx/msw/timectrl.h
|
||||
wx/msw/datectrl.h
|
||||
wx/msw/calctrl.h
|
||||
</set>
|
||||
<set var="MSW_RSC" hints="files">
|
||||
<!-- Resources must be installed together with headers: -->
|
||||
@@ -2467,6 +2613,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/osx/cocoa/window.mm
|
||||
src/osx/cocoa/settings.mm
|
||||
src/osx/cocoa/overlay.mm
|
||||
src/osx/cocoa/aboutdlg.mm
|
||||
src/generic/animateg.cpp
|
||||
src/osx/dataview_osx.cpp
|
||||
src/osx/cocoa/notifmsg.mm
|
||||
src/osx/cocoa/taskbar.mm
|
||||
src/osx/datectrl_osx.cpp
|
||||
src/osx/cocoa/datetimectrl.mm
|
||||
src/osx/core/sound.cpp
|
||||
src/osx/sound_osx.cpp
|
||||
src/osx/datetimectrl_osx.cpp
|
||||
src/osx/core/hidjoystick.cpp
|
||||
src/osx/carbon/sound.cpp
|
||||
src/osx/cocoa/dataview.mm
|
||||
src/osx/timectrl_osx.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/osx/cocoa/activityindicator.mm
|
||||
</set>
|
||||
<set var="OSX_COCOA_HDR" hints="files">
|
||||
wx/osx/cocoa/chkconf.h
|
||||
@@ -2474,6 +2636,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/osx/cocoa/private.h
|
||||
wx/generic/region.h
|
||||
wx/osx/cocoa/stdpaths.h
|
||||
wx/osx/sound.h
|
||||
wx/generic/animate.h
|
||||
wx/osx/dvrenderer.h
|
||||
wx/osx/cocoa/dataview.h
|
||||
wx/osx/dvrenderers.h
|
||||
wx/osx/taskbarosx.h
|
||||
wx/osx/activityindicator.h
|
||||
wx/osx/joystick.h
|
||||
wx/osx/dataview.h
|
||||
wx/osx/datectrl.h
|
||||
wx/osx/timectrl.h
|
||||
wx/osx/datetimectrl.h
|
||||
wx/osx/core/joystick.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@@ -2502,6 +2677,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/osx/iphone/window.mm
|
||||
src/osx/cocoa/stdpaths.mm
|
||||
src/osx/iphone/settings.mm
|
||||
src/osx/sound_osx.cpp
|
||||
src/osx/core/sound.cpp
|
||||
src/generic/animateg.cpp
|
||||
</set>
|
||||
|
||||
<set var="OSX_IPHONE_HDR" hints="files">
|
||||
@@ -2509,6 +2687,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/osx/iphone/evtloop.h
|
||||
wx/osx/iphone/private.h
|
||||
wx/generic/region.h
|
||||
wx/generic/animate.h
|
||||
wx/osx/sound.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@@ -2527,12 +2707,35 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<if cond="TOOLKIT=='MSW'">
|
||||
src/msw/evtloop.cpp
|
||||
</if>
|
||||
<!--
|
||||
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=='X11'">
|
||||
src/generic/animateg.cpp
|
||||
</if>
|
||||
</set>
|
||||
<set var="UNIV_PLATFORM_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">
|
||||
wx/msw/evtloop.h
|
||||
</if>
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
|
||||
wx/generic/animate.h
|
||||
</if>
|
||||
<if cond="TOOLKIT=='MSW'">
|
||||
wx/generic/animate.h
|
||||
</if>
|
||||
<if cond="TOOLKIT=='X11'">
|
||||
wx/generic/animate.h
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<set var="UNIV_SRC" hints="files">
|
||||
$(UNIV_PLATFORM_SRC)
|
||||
src/generic/accel.cpp
|
||||
@@ -2649,320 +2852,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxAdvanced -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="ADVANCED_CMN_SRC" hints="files">
|
||||
src/common/animatecmn.cpp
|
||||
src/common/bmpcboxcmn.cpp
|
||||
src/common/calctrlcmn.cpp
|
||||
src/common/datavcmn.cpp
|
||||
src/common/gridcmn.cpp
|
||||
src/common/hyperlnkcmn.cpp
|
||||
src/common/odcombocmn.cpp
|
||||
src/common/richtooltipcmn.cpp
|
||||
src/generic/aboutdlgg.cpp
|
||||
src/generic/bannerwindow.cpp
|
||||
src/generic/bmpcboxg.cpp
|
||||
src/generic/calctrlg.cpp
|
||||
src/generic/commandlinkbuttong.cpp
|
||||
src/generic/datavgen.cpp
|
||||
src/generic/datectlg.cpp
|
||||
src/generic/editlbox.cpp
|
||||
src/generic/grid.cpp
|
||||
src/generic/gridctrl.cpp
|
||||
src/generic/grideditors.cpp
|
||||
src/generic/gridsel.cpp
|
||||
src/generic/helpext.cpp
|
||||
src/generic/hyperlinkg.cpp
|
||||
src/generic/laywin.cpp
|
||||
src/generic/notifmsgg.cpp
|
||||
src/generic/odcombo.cpp
|
||||
src/generic/propdlg.cpp
|
||||
src/generic/richtooltipg.cpp
|
||||
src/generic/sashwin.cpp
|
||||
src/generic/splash.cpp
|
||||
src/generic/timectrlg.cpp
|
||||
src/generic/tipdlg.cpp
|
||||
src/generic/treelist.cpp
|
||||
src/generic/wizard.cpp
|
||||
src/common/addremovectrl.cpp
|
||||
src/common/notifmsgcmn.cpp
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_CMN_HDR" hints="files">
|
||||
wx/aboutdlg.h
|
||||
wx/animate.h
|
||||
wx/bannerwindow.h
|
||||
wx/bmpcbox.h
|
||||
wx/calctrl.h
|
||||
wx/commandlinkbutton.h
|
||||
wx/dataview.h
|
||||
wx/datectrl.h
|
||||
wx/dateevt.h
|
||||
wx/datetimectrl.h
|
||||
wx/dcbuffer.h
|
||||
wx/dvrenderers.h
|
||||
wx/editlbox.h
|
||||
wx/generic/aboutdlgg.h
|
||||
wx/generic/bmpcbox.h
|
||||
wx/generic/calctrlg.h
|
||||
wx/generic/datectrl.h
|
||||
wx/generic/dataview.h
|
||||
wx/generic/dvrenderer.h
|
||||
wx/generic/dvrenderers.h
|
||||
wx/generic/grid.h
|
||||
wx/generic/gridctrl.h
|
||||
wx/generic/grideditors.h
|
||||
wx/generic/gridsel.h
|
||||
wx/generic/helpext.h
|
||||
wx/generic/hyperlink.h
|
||||
wx/generic/laywin.h
|
||||
wx/generic/notifmsg.h
|
||||
wx/generic/propdlg.h
|
||||
wx/generic/sashwin.h
|
||||
wx/generic/splash.h
|
||||
wx/generic/timectrl.h
|
||||
wx/generic/wizard.h
|
||||
wx/grid.h
|
||||
wx/hyperlink.h
|
||||
wx/joystick.h
|
||||
wx/laywin.h
|
||||
wx/notifmsg.h
|
||||
wx/odcombo.h
|
||||
wx/propdlg.h
|
||||
wx/richtooltip.h
|
||||
wx/sashwin.h
|
||||
wx/sound.h
|
||||
wx/splash.h
|
||||
wx/taskbar.h
|
||||
wx/timectrl.h
|
||||
wx/tipdlg.h
|
||||
wx/treelist.h
|
||||
wx/wizard.h
|
||||
wx/addremovectrl.h
|
||||
wx/activityindicator.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_MSW_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/msw/aboutdlg.cpp
|
||||
src/msw/notifmsg.cpp
|
||||
src/msw/richtooltip.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/taskbar.cpp
|
||||
src/msw/rt/notifmsgrt.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_MSW_HDR" hints="files">
|
||||
wx/msw/sound.h
|
||||
wx/msw/taskbar.h
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
|
||||
<!-- not used with wxUniv -->
|
||||
<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/msw/bmpcbox.cpp
|
||||
src/msw/calctrl.cpp
|
||||
src/msw/commandlinkbutton.cpp
|
||||
src/msw/datecontrols.cpp
|
||||
src/msw/datectrl.cpp
|
||||
src/msw/datetimectrl.cpp
|
||||
src/msw/hyperlink.cpp
|
||||
src/msw/timectrl.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/msw/bmpcbox.h
|
||||
wx/msw/commandlinkbutton.h
|
||||
wx/msw/calctrl.h
|
||||
wx/msw/datectrl.h
|
||||
wx/msw/datetimectrl.h
|
||||
wx/msw/hyperlink.h
|
||||
wx/msw/timectrl.h
|
||||
</set>
|
||||
|
||||
<!-- not built on WindowsCE: -->
|
||||
<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">
|
||||
src/msw/joystick.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">
|
||||
wx/msw/joystick.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/osx/datetimectrl_osx.cpp
|
||||
src/osx/datectrl_osx.cpp
|
||||
src/osx/sound_osx.cpp
|
||||
src/osx/timectrl_osx.cpp
|
||||
src/osx/carbon/sound.cpp
|
||||
src/osx/core/sound.cpp
|
||||
src/osx/cocoa/aboutdlg.mm
|
||||
src/osx/dataview_osx.cpp
|
||||
src/osx/cocoa/dataview.mm
|
||||
src/osx/cocoa/datetimectrl.mm
|
||||
src/osx/cocoa/taskbar.mm
|
||||
src/osx/core/hidjoystick.cpp
|
||||
src/osx/cocoa/activityindicator.mm
|
||||
src/osx/cocoa/notifmsg.mm
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/osx/activityindicator.h
|
||||
wx/osx/dataview.h
|
||||
wx/osx/datectrl.h
|
||||
wx/osx/datetimectrl.h
|
||||
wx/osx/dvrenderer.h
|
||||
wx/osx/dvrenderers.h
|
||||
wx/osx/joystick.h
|
||||
wx/osx/sound.h
|
||||
wx/osx/taskbarosx.h
|
||||
wx/osx/timectrl.h
|
||||
wx/osx/core/joystick.h
|
||||
wx/osx/cocoa/dataview.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/osx/sound_osx.cpp
|
||||
src/osx/core/sound.cpp
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_OSX_IPHONE_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/osx/sound.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_COCOA_SRC" hints="files">
|
||||
src/cocoa/taskbar.mm
|
||||
src/common/taskbarcmn.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/osx/core/hidjoystick.cpp
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_COCOA_HDR" hints="files">
|
||||
wx/cocoa/taskbar.h
|
||||
wx/generic/animate.h
|
||||
wx/osx/core/joystick.h
|
||||
</set>
|
||||
|
||||
|
||||
<set var="ADVANCED_UNIX_SRC" hints="files">
|
||||
src/common/taskbarcmn.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/unix/sound.cpp
|
||||
src/unix/taskbarx11.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_UNIX_HDR" hints="files">
|
||||
wx/unix/joystick.h
|
||||
wx/unix/sound.h
|
||||
wx/unix/taskbarx11.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_MOTIF_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_MOTIF_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/generic/animateanimate.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)
|
||||
src/gtk/notifmsg.cpp
|
||||
src/gtk/taskbar.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_GTK2_SRC" hints="files">
|
||||
$(ADVANCED_GTK_SRC)
|
||||
src/gtk/eggtrayicon.c
|
||||
src/generic/activityindicator.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_GTK_HDR" hints="files">
|
||||
$(ADVANCED_GTK_PLATFORM_HDR)
|
||||
wx/gtk/taskbar.h
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
<set var="ADVANCED_GTK2_HDR" hints="files">
|
||||
$(ADVANCED_GTK_HDR)
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
|
||||
src/gtk/aboutdlg.cpp
|
||||
src/gtk/animate.cpp
|
||||
src/gtk/bmpcbox.cpp
|
||||
src/gtk/calctrl.cpp
|
||||
src/gtk/dataview.cpp
|
||||
src/gtk/hyperlink.cpp
|
||||
src/gtk/activityindicator.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
|
||||
wx/gtk/animate.h
|
||||
wx/gtk/bmpcbox.h
|
||||
wx/gtk/calctrl.h
|
||||
wx/gtk/dataview.h
|
||||
wx/gtk/dvrenderer.h
|
||||
wx/gtk/dvrenderers.h
|
||||
wx/gtk/hyperlink.h
|
||||
wx/gtk/activityindicator.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_GTK1_SRC" hints="files">
|
||||
src/generic/animateg.cpp
|
||||
src/gtk1/eggtrayicon.c
|
||||
src/gtk1/taskbar.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
</set>
|
||||
<set var="ADVANCED_GTK1_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
wx/generic/activityindicator.h
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_UNIV_SRC" hints="files">
|
||||
<!--
|
||||
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=='X11'">
|
||||
src/generic/animateg.cpp
|
||||
</if>
|
||||
</set>
|
||||
<set var="ADVANCED_UNIV_HDR" hints="files">
|
||||
wx/generic/animate.h
|
||||
</set>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- wxMedia -->
|
||||
<!-- ====================================================================== -->
|
||||
@@ -3645,7 +3534,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<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=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
|
||||
@@ -3657,7 +3546,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<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>
|
||||
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
|
||||
@@ -3701,56 +3590,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<!-- wxAdvanced files: -->
|
||||
<set var="ADVANCED_PLATFORM_SRC" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</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=='4'">$(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=='QT'">$(ADVANCED_QT_SRC)</if>
|
||||
</set>
|
||||
<set var="ADVANCED_PLATFORM_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
|
||||
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</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=='4'">$(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=='QT'">$(ADVANCED_QT_HDR)</if>
|
||||
</set>
|
||||
|
||||
<!-- wxAdv files not used by wxUniv -->
|
||||
<set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_NATIVE_SRC)</if>
|
||||
<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>
|
||||
</set>
|
||||
<set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
|
||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_NATIVE_HDR)</if>
|
||||
<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>
|
||||
</set>
|
||||
|
||||
<set var="ADVANCED_SRC" hints="files">
|
||||
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
|
||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
|
||||
</set>
|
||||
<set var="ADVANCED_HDR" hints="files">
|
||||
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
|
||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
|
||||
</set>
|
||||
<!-- wxAdvanced: empty, kept only for backwards compatibility -->
|
||||
<set var="ADVANCED_SRC" hints="files"/>
|
||||
<set var="ADVANCED_HDR" hints="files"/>
|
||||
|
||||
<!-- wxMedia files: -->
|
||||
<set var="MEDIA_PLATFORM_SRC" hints="files">
|
||||
@@ -3787,7 +3629,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(GUI_CMN_HDR)
|
||||
$(LOWLEVEL_HDR)
|
||||
$(GUI_CORE_HEADERS)
|
||||
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
|
||||
$(MEDIA_HDR) $(HTML_HDR)
|
||||
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
|
||||
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
|
||||
</if>
|
||||
|
||||
@@ -266,7 +266,6 @@
|
||||
<define>WXMAKINGDLL_XRC</define>
|
||||
<sources>$(XRC_SRC)</sources>
|
||||
<library>$(htmldll_library_link)</library>
|
||||
<library>advdll</library>
|
||||
<library>coredll</library>
|
||||
<library>xmldll</library>
|
||||
<library>basedll</library>
|
||||
@@ -292,7 +291,6 @@
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_AUI</define>
|
||||
<sources>$(AUI_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<msvc-headers>$(AUI_HDR)</msvc-headers>
|
||||
@@ -317,7 +315,6 @@
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_RIBBON</define>
|
||||
<sources>$(RIBBON_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<msvc-headers>$(RIBBON_HDR)</msvc-headers>
|
||||
@@ -342,7 +339,6 @@
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_PROPGRID</define>
|
||||
<sources>$(PROPGRID_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
<msvc-headers>$(PROPGRID_HDR)</msvc-headers>
|
||||
@@ -367,7 +363,6 @@
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_RICHTEXT</define>
|
||||
<sources>$(RICHTEXT_SRC)</sources>
|
||||
<library>advdll</library>
|
||||
<library>$(htmldll_library_link)</library>
|
||||
<library>xmldll</library>
|
||||
<library>coredll</library>
|
||||
|
||||
@@ -99,7 +99,6 @@
|
||||
<wx-lib>xrc</wx-lib>
|
||||
<wx-lib>html</wx-lib>
|
||||
<wx-lib>media</wx-lib>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>net</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
|
||||
@@ -251,6 +251,13 @@ set(QT_HDR
|
||||
wx/qt/utils.h
|
||||
wx/qt/window.h
|
||||
wx/qt/private/winevent.h
|
||||
wx/qt/dvrenderer.h
|
||||
wx/qt/dvrenderers.h
|
||||
wx/generic/animate.h
|
||||
wx/qt/calctrl.h
|
||||
wx/qt/taskbar.h
|
||||
wx/qt/dataview.h
|
||||
wx/generic/activityindicator.h
|
||||
)
|
||||
|
||||
set(QT_SRC
|
||||
@@ -341,6 +348,16 @@ set(QT_SRC
|
||||
src/qt/uiaction.cpp
|
||||
src/qt/utils.cpp
|
||||
src/qt/window.cpp
|
||||
src/qt/dvrenderers.cpp
|
||||
src/qt/dvrenderer.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/unix/sound.cpp
|
||||
src/qt/calctrl.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/qt/dataview.cpp
|
||||
src/qt/taskbar.cpp
|
||||
)
|
||||
|
||||
set(ADVANCED_QT_HDR
|
||||
@@ -858,6 +875,41 @@ set(GUI_CMN_SRC
|
||||
src/generic/vlbox.cpp
|
||||
src/generic/vscroll.cpp
|
||||
src/xrc/xmlreshandler.cpp
|
||||
src/common/bmpcboxcmn.cpp
|
||||
src/generic/grideditors.cpp
|
||||
src/generic/gridctrl.cpp
|
||||
src/generic/grid.cpp
|
||||
src/generic/hyperlinkg.cpp
|
||||
src/common/calctrlcmn.cpp
|
||||
src/generic/notifmsgg.cpp
|
||||
src/generic/odcombo.cpp
|
||||
src/generic/splash.cpp
|
||||
src/common/gridcmn.cpp
|
||||
src/common/addremovectrl.cpp
|
||||
src/generic/tipdlg.cpp
|
||||
src/generic/aboutdlgg.cpp
|
||||
src/generic/gridsel.cpp
|
||||
src/generic/sashwin.cpp
|
||||
src/generic/helpext.cpp
|
||||
src/generic/richtooltipg.cpp
|
||||
src/generic/bmpcboxg.cpp
|
||||
src/generic/timectrlg.cpp
|
||||
src/common/notifmsgcmn.cpp
|
||||
src/generic/commandlinkbuttong.cpp
|
||||
src/generic/propdlg.cpp
|
||||
src/generic/treelist.cpp
|
||||
src/common/datavcmn.cpp
|
||||
src/common/animatecmn.cpp
|
||||
src/common/odcombocmn.cpp
|
||||
src/common/hyperlnkcmn.cpp
|
||||
src/common/richtooltipcmn.cpp
|
||||
src/generic/datectlg.cpp
|
||||
src/generic/bannerwindow.cpp
|
||||
src/generic/laywin.cpp
|
||||
src/generic/calctrlg.cpp
|
||||
src/generic/wizard.cpp
|
||||
src/generic/editlbox.cpp
|
||||
src/generic/datavgen.cpp
|
||||
)
|
||||
|
||||
set(GUI_CMN_HDR
|
||||
@@ -1096,6 +1148,57 @@ set(GUI_CMN_HDR
|
||||
wx/xpmdecod.h
|
||||
wx/xpmhand.h
|
||||
wx/xrc/xmlreshandler.h
|
||||
wx/splash.h
|
||||
wx/dateevt.h
|
||||
wx/editlbox.h
|
||||
wx/generic/hyperlink.h
|
||||
wx/joystick.h
|
||||
wx/dcbuffer.h
|
||||
wx/timectrl.h
|
||||
wx/hyperlink.h
|
||||
wx/bmpcbox.h
|
||||
wx/addremovectrl.h
|
||||
wx/generic/gridctrl.h
|
||||
wx/generic/notifmsg.h
|
||||
wx/odcombo.h
|
||||
wx/animate.h
|
||||
wx/sashwin.h
|
||||
wx/generic/propdlg.h
|
||||
wx/tipdlg.h
|
||||
wx/dataview.h
|
||||
wx/generic/helpext.h
|
||||
wx/grid.h
|
||||
wx/generic/grid.h
|
||||
wx/generic/grideditors.h
|
||||
wx/wizard.h
|
||||
wx/generic/dataview.h
|
||||
wx/generic/wizard.h
|
||||
wx/generic/dvrenderers.h
|
||||
wx/generic/bmpcbox.h
|
||||
wx/datetimectrl.h
|
||||
wx/activityindicator.h
|
||||
wx/bannerwindow.h
|
||||
wx/dvrenderers.h
|
||||
wx/generic/datectrl.h
|
||||
wx/calctrl.h
|
||||
wx/propdlg.h
|
||||
wx/generic/dvrenderer.h
|
||||
wx/generic/timectrl.h
|
||||
wx/commandlinkbutton.h
|
||||
wx/richtooltip.h
|
||||
wx/sound.h
|
||||
wx/generic/aboutdlgg.h
|
||||
wx/taskbar.h
|
||||
wx/treelist.h
|
||||
wx/notifmsg.h
|
||||
wx/datectrl.h
|
||||
wx/laywin.h
|
||||
wx/generic/gridsel.h
|
||||
wx/aboutdlg.h
|
||||
wx/generic/laywin.h
|
||||
wx/generic/splash.h
|
||||
wx/generic/calctrlg.h
|
||||
wx/generic/sashwin.h
|
||||
)
|
||||
|
||||
set(UNIX_SRC
|
||||
@@ -1111,6 +1214,10 @@ set(XWIN_LOWLEVEL_SRC
|
||||
src/unix/fontutil.cpp
|
||||
src/unix/uiactionx11.cpp
|
||||
src/unix/utilsx11.cpp
|
||||
src/unix/sound.cpp
|
||||
src/unix/joystick.cpp
|
||||
src/unix/taskbarx11.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
)
|
||||
|
||||
set(XWIN_LOWLEVEL_HDR
|
||||
@@ -1118,6 +1225,9 @@ set(XWIN_LOWLEVEL_HDR
|
||||
wx/generic/imaglist.h
|
||||
wx/unix/fontutil.h
|
||||
wx/unix/utilsx11.h
|
||||
wx/unix/taskbarx11.h
|
||||
wx/unix/sound.h
|
||||
wx/unix/joystick.h
|
||||
)
|
||||
|
||||
set(GTK_WIN32_SRC
|
||||
@@ -1134,6 +1244,9 @@ set(GTK_WIN32_SRC
|
||||
src/msw/utilswin.cpp
|
||||
src/unix/fontenum.cpp
|
||||
src/unix/fontutil.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/joystick.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
)
|
||||
|
||||
set(GTK_WIN32_HDR
|
||||
@@ -1146,6 +1259,9 @@ set(GTK_WIN32_HDR
|
||||
wx/msw/ole/uuid.h
|
||||
wx/msw/dib.h
|
||||
wx/unix/fontutil.h
|
||||
wx/msw/sound.h
|
||||
wx/msw/taskbar.h
|
||||
wx/msw/joystick.h
|
||||
)
|
||||
|
||||
set(GTK_LOWLEVEL_SRC
|
||||
@@ -1279,12 +1395,23 @@ set(GTK_SRC
|
||||
src/gtk/textentry.cpp
|
||||
src/gtk/tglbtn.cpp
|
||||
src/gtk/treeentry_gtk.c
|
||||
src/gtk/taskbar.cpp
|
||||
src/gtk/notifmsg.cpp
|
||||
src/gtk/dataview.cpp
|
||||
src/gtk/aboutdlg.cpp
|
||||
src/gtk/calctrl.cpp
|
||||
src/gtk/activityindicator.cpp
|
||||
src/gtk/animate.cpp
|
||||
src/gtk/bmpcbox.cpp
|
||||
src/gtk/hyperlink.cpp
|
||||
)
|
||||
|
||||
set(GTK2_SRC
|
||||
${GTK_SRC}
|
||||
# Generic implementations used by wxGPE:
|
||||
src/generic/fontdlgg.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/gtk/eggtrayicon.c
|
||||
)
|
||||
|
||||
set(GTK_HDR
|
||||
@@ -1338,6 +1465,16 @@ set(GTK_HDR
|
||||
wx/gtk/textctrl.h
|
||||
wx/gtk/textentry.h
|
||||
wx/gtk/tglbtn.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/gtk/dataview.h
|
||||
wx/gtk/dvrenderers.h
|
||||
wx/gtk/calctrl.h
|
||||
wx/gtk/animate.h
|
||||
wx/gtk/bmpcbox.h
|
||||
wx/gtk/dvrenderer.h
|
||||
wx/gtk/taskbar.h
|
||||
wx/gtk/activityindicator.h
|
||||
wx/gtk/hyperlink.h
|
||||
)
|
||||
|
||||
set(GTK2_HDR
|
||||
@@ -1457,6 +1594,10 @@ set(GTK1_SRC
|
||||
src/gtk1/toolbar.cpp
|
||||
src/gtk1/textctrl.cpp
|
||||
src/gtk1/tglbtn.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/gtk1/eggtrayicon.c
|
||||
src/generic/activityindicator.cpp
|
||||
src/gtk1/taskbar.cpp
|
||||
)
|
||||
|
||||
set(GTK1_HDR
|
||||
@@ -1505,6 +1646,8 @@ set(GTK1_HDR
|
||||
wx/gtk1/textctrl.h
|
||||
wx/gtk1/tglbtn.h
|
||||
wx/gtk1/treectrl.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/generic/animate.h
|
||||
)
|
||||
|
||||
set(MOTIF_LOWLEVEL_SRC
|
||||
@@ -1596,6 +1739,8 @@ set(MOTIF_SRC
|
||||
src/generic/statline.cpp
|
||||
src/generic/statusbr.cpp
|
||||
src/generic/tabg.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
)
|
||||
|
||||
set(MOTIF_HDR
|
||||
@@ -1667,6 +1812,8 @@ set(MOTIF_HDR
|
||||
wx/motif/toolbar.h
|
||||
wx/motif/toplevel.h
|
||||
wx/motif/window.h
|
||||
wx/generic/animateanimate.h
|
||||
wx/generic/animate.h
|
||||
)
|
||||
|
||||
set(X11_LOWLEVEL_SRC
|
||||
@@ -1790,6 +1937,19 @@ set(MSW_LOWLEVEL_SRC
|
||||
src/msw/utilswin.cpp
|
||||
src/msw/uxtheme.cpp
|
||||
src/msw/window.cpp
|
||||
src/msw/joystick.cpp
|
||||
src/msw/rt/notifmsgrt.cpp
|
||||
src/msw/aboutdlg.cpp
|
||||
src/msw/sound.cpp
|
||||
src/msw/ole/uuid.cpp
|
||||
src/msw/helpchm.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/msw/helpwin.cpp
|
||||
src/msw/notifmsg.cpp
|
||||
src/msw/ole/automtn.cpp
|
||||
src/msw/taskbar.cpp
|
||||
src/generic/activityindicator.cpp
|
||||
src/msw/richtooltip.cpp
|
||||
)
|
||||
|
||||
set(MSW_LOWLEVEL_HDR
|
||||
@@ -1798,6 +1958,12 @@ set(MSW_LOWLEVEL_HDR
|
||||
wx/msw/popupwin.h
|
||||
wx/msw/uxtheme.h
|
||||
wx/msw/htmlhelp.h
|
||||
wx/msw/helpchm.h
|
||||
wx/msw/sound.h
|
||||
wx/generic/activityindicator.h
|
||||
wx/msw/joystick.h
|
||||
wx/msw/helpwin.h
|
||||
wx/msw/taskbar.h
|
||||
)
|
||||
|
||||
set(MSW_DESKTOP_LOWLEVEL_SRC
|
||||
@@ -1873,6 +2039,15 @@ set(MSW_SRC
|
||||
src/msw/textentry.cpp
|
||||
src/msw/tglbtn.cpp
|
||||
src/msw/treectrl.cpp
|
||||
src/msw/bmpcbox.cpp
|
||||
src/msw/datectrl.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/msw/calctrl.cpp
|
||||
src/msw/datecontrols.cpp
|
||||
src/msw/timectrl.cpp
|
||||
src/msw/commandlinkbutton.cpp
|
||||
src/msw/datetimectrl.cpp
|
||||
src/msw/hyperlink.cpp
|
||||
)
|
||||
|
||||
set(MSW_HDR
|
||||
@@ -1973,6 +2148,14 @@ set(MSW_HDR
|
||||
wx/msw/toplevel.h
|
||||
wx/msw/treectrl.h
|
||||
wx/msw/window.h
|
||||
wx/msw/calctrl.h
|
||||
wx/msw/bmpcbox.h
|
||||
wx/msw/datectrl.h
|
||||
wx/msw/commandlinkbutton.h
|
||||
wx/msw/hyperlink.h
|
||||
wx/msw/datetimectrl.h
|
||||
wx/msw/timectrl.h
|
||||
wx/generic/animate.h
|
||||
)
|
||||
|
||||
set(MSW_RSC
|
||||
@@ -2326,6 +2509,22 @@ set(OSX_COCOA_SRC
|
||||
src/osx/cocoa/toolbar.mm
|
||||
src/osx/cocoa/tooltip.mm
|
||||
src/osx/cocoa/window.mm
|
||||
src/osx/core/hidjoystick.cpp
|
||||
src/osx/sound_osx.cpp
|
||||
src/osx/cocoa/datetimectrl.mm
|
||||
src/osx/datetimectrl_osx.cpp
|
||||
src/osx/cocoa/aboutdlg.mm
|
||||
src/osx/timectrl_osx.cpp
|
||||
src/osx/cocoa/activityindicator.mm
|
||||
src/osx/cocoa/dataview.mm
|
||||
src/osx/carbon/sound.cpp
|
||||
src/osx/cocoa/taskbar.mm
|
||||
src/generic/animateg.cpp
|
||||
src/common/taskbarcmn.cpp
|
||||
src/osx/dataview_osx.cpp
|
||||
src/osx/cocoa/notifmsg.mm
|
||||
src/osx/datectrl_osx.cpp
|
||||
src/osx/core/sound.cpp
|
||||
)
|
||||
|
||||
set(OSX_COCOA_HDR
|
||||
@@ -2334,6 +2533,19 @@ set(OSX_COCOA_HDR
|
||||
wx/osx/cocoa/private.h
|
||||
wx/osx/cocoa/stdpaths.h
|
||||
wx/generic/region.h
|
||||
wx/osx/activityindicator.h
|
||||
wx/osx/datectrl.h
|
||||
wx/osx/sound.h
|
||||
wx/osx/joystick.h
|
||||
wx/osx/timectrl.h
|
||||
wx/osx/dvrenderer.h
|
||||
wx/osx/dataview.h
|
||||
wx/osx/cocoa/dataview.h
|
||||
wx/osx/datetimectrl.h
|
||||
wx/osx/taskbarosx.h
|
||||
wx/osx/dvrenderers.h
|
||||
wx/generic/animate.h
|
||||
wx/osx/core/joystick.h
|
||||
)
|
||||
|
||||
set(OSX_IPHONE_SRC
|
||||
@@ -2358,6 +2570,9 @@ set(OSX_IPHONE_SRC
|
||||
src/osx/iphone/toolbar.mm
|
||||
src/osx/iphone/utils.mm
|
||||
src/osx/iphone/window.mm
|
||||
src/osx/sound_osx.cpp
|
||||
src/generic/animateg.cpp
|
||||
src/osx/core/sound.cpp
|
||||
)
|
||||
|
||||
set(OSX_IPHONE_HDR
|
||||
@@ -2365,6 +2580,8 @@ set(OSX_IPHONE_HDR
|
||||
wx/osx/iphone/evtloop.h
|
||||
wx/osx/iphone/private.h
|
||||
wx/generic/region.h
|
||||
wx/generic/animate.h
|
||||
wx/osx/sound.h
|
||||
)
|
||||
|
||||
set(UNIV_THEMES_SRC
|
||||
|
||||
903
build/files
903
build/files
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -446,10 +446,6 @@
|
||||
</Bscmake>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\common\animatecmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\calctrlcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\datavcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\dummy.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Create</PrecompiledHeader>
|
||||
@@ -460,55 +456,6 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\gridcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\odcombocmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\common\taskbarcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\aboutdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\bmpcbox.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\calctrl.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datecontrols.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datetimectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\hyperlink.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\joystick.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\notifmsg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\richtooltip.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\sound.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\taskbar.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\timectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\animateg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\calctrlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\datavgen.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\datectlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\editlbox.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\grid.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\gridctrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\grideditors.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\gridsel.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\helpext.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\laywin.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\odcombo.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\propdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\richtooltipg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\sashwin.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\splash.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\timectrlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\tipdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\treelist.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\wizard.cpp" />
|
||||
<ClCompile Include="..\..\src\common\addremovectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\activityindicator.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\src\msw\version.rc">
|
||||
@@ -529,11 +476,6 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</CustomBuild>
|
||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||
@@ -544,64 +486,6 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</CustomBuild>
|
||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\sound.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbar.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\animate.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\calctrlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dataview.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\grid.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\gridctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\grideditors.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\gridsel.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\helpext.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\laywin.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\notifmsg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\propdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\sashwin.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\splash.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\wizard.h" />
|
||||
<ClInclude Include="..\..\include\wx\aboutdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\animate.h" />
|
||||
<ClInclude Include="..\..\include\wx\bannerwindow.h" />
|
||||
<ClInclude Include="..\..\include\wx\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\calctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\commandlinkbutton.h" />
|
||||
<ClInclude Include="..\..\include\wx\dataview.h" />
|
||||
<ClInclude Include="..\..\include\wx\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\dateevt.h" />
|
||||
<ClInclude Include="..\..\include\wx\datetimectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\dcbuffer.h" />
|
||||
<ClInclude Include="..\..\include\wx\dvrenderers.h" />
|
||||
<ClInclude Include="..\..\include\wx\editlbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\grid.h" />
|
||||
<ClInclude Include="..\..\include\wx\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\joystick.h" />
|
||||
<ClInclude Include="..\..\include\wx\laywin.h" />
|
||||
<ClInclude Include="..\..\include\wx\notifmsg.h" />
|
||||
<ClInclude Include="..\..\include\wx\odcombo.h" />
|
||||
<ClInclude Include="..\..\include\wx\propdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\richtooltip.h" />
|
||||
<ClInclude Include="..\..\include\wx\sashwin.h" />
|
||||
<ClInclude Include="..\..\include\wx\sound.h" />
|
||||
<ClInclude Include="..\..\include\wx\splash.h" />
|
||||
<ClInclude Include="..\..\include\wx\taskbar.h" />
|
||||
<ClInclude Include="..\..\include\wx\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\tipdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\treelist.h" />
|
||||
<ClInclude Include="..\..\include\wx\wizard.h" />
|
||||
<ClInclude Include="..\..\include\wx\addremovectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\activityindicator.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@@ -24,168 +24,9 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\common\addremovectrl.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\animatecmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\calctrlcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\datavcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\dummy.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\gridcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\odcombocmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\taskbarcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\activityindicator.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\animateg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\bannerwindow.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\calctrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datavgen.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datectlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\editlbox.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\grid.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridctrl.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\grideditors.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridsel.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\helpext.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\laywin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\notifmsgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\odcombo.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\propdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\richtooltipg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\sashwin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\splash.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\timectrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\tipdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\treelist.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\wizard.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\aboutdlg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\bmpcbox.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\calctrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datecontrols.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datetimectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\hyperlink.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\joystick.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\notifmsg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\richtooltip.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\sound.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\taskbar.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\timectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\src\msw\version.rc">
|
||||
@@ -193,195 +34,6 @@
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\include\wx\aboutdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\activityindicator.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\addremovectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\animate.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bannerwindow.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bmpcbox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\calctrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\commandlinkbutton.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dataview.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\datectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dateevt.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\datetimectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dcbuffer.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dvrenderers.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\editlbox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\activityindicator.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\animate.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\calctrlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dataview.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\datectrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\grid.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridctrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\grideditors.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridsel.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\helpext.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\hyperlink.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\laywin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\notifmsg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\propdlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\sashwin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\splash.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\timectrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\wizard.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\grid.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\hyperlink.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\joystick.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\laywin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\joystick.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\sound.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbar.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\timectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\notifmsg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\odcombo.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\propdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\richtooltip.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sashwin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sound.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\splash.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\taskbar.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\timectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\tipdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\treelist.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\wizard.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||
|
||||
@@ -1008,6 +1008,59 @@
|
||||
<ClCompile Include="..\..\src\generic\collheaderctrlg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\rt\utilsrt.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\customdraw.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\calctrl.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datecontrols.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\bmpcbox.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\aboutdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\notifmsg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\hyperlink.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\activityindicator.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\joystick.cpp" />
|
||||
<ClCompile Include="..\..\src\common\taskbarcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\richtooltip.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\datetimectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\animateg.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\taskbar.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\sound.cpp" />
|
||||
<ClCompile Include="..\..\src\msw\timectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\grid.cpp" />
|
||||
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\calctrlg.cpp" />
|
||||
<ClCompile Include="..\..\src\common\gridcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\treelist.cpp" />
|
||||
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\editlbox.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
|
||||
<ClCompile Include="..\..\src\common\datavcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\gridsel.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\gridctrl.cpp" />
|
||||
<ClCompile Include="..\..\src\common\odcombocmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\richtooltipg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\propdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\sashwin.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\odcombo.cpp" />
|
||||
<ClCompile Include="..\..\src\common\calctrlcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\datectlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\laywin.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\timectrlg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\splash.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\grideditors.cpp" />
|
||||
<ClCompile Include="..\..\src\common\animatecmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\tipdlg.cpp" />
|
||||
<ClCompile Include="..\..\src\common\addremovectrl.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\datavgen.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\helpext.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\wizard.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp" />
|
||||
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
|
||||
<ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
|
||||
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\src\msw\version.rc">
|
||||
@@ -1382,6 +1435,69 @@
|
||||
<ClInclude Include="..\..\include\wx\itemattr.h" />
|
||||
<ClInclude Include="..\..\include\wx\peninfobase.h" />
|
||||
<ClInclude Include="..\..\include\wx\persist\dataview.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbar.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\sound.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\animate.h" />
|
||||
<ClInclude Include="..\..\include\wx\sashwin.h" />
|
||||
<ClInclude Include="..\..\include\wx\grid.h" />
|
||||
<ClInclude Include="..\..\include\wx\commandlinkbutton.h" />
|
||||
<ClInclude Include="..\..\include\wx\taskbar.h" />
|
||||
<ClInclude Include="..\..\include\wx\sound.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\sashwin.h" />
|
||||
<ClInclude Include="..\..\include\wx\wizard.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\helpext.h" />
|
||||
<ClInclude Include="..\..\include\wx\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\calctrlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\bannerwindow.h" />
|
||||
<ClInclude Include="..\..\include\wx\splash.h" />
|
||||
<ClInclude Include="..\..\include\wx\treelist.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\gridctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\editlbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\laywin.h" />
|
||||
<ClInclude Include="..\..\include\wx\dateevt.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\grid.h" />
|
||||
<ClInclude Include="..\..\include\wx\aboutdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\datetimectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\wizard.h" />
|
||||
<ClInclude Include="..\..\include\wx\animate.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\hyperlink.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\grideditors.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\timectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\notifmsg.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\datectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\propdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\notifmsg.h" />
|
||||
<ClInclude Include="..\..\include\wx\laywin.h" />
|
||||
<ClInclude Include="..\..\include\wx\calctrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\tipdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\joystick.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\dataview.h" />
|
||||
<ClInclude Include="..\..\include\wx\dvrenderers.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h" />
|
||||
<ClInclude Include="..\..\include\wx\addremovectrl.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\splash.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\propdlg.h" />
|
||||
<ClInclude Include="..\..\include\wx\odcombo.h" />
|
||||
<ClInclude Include="..\..\include\wx\dataview.h" />
|
||||
<ClInclude Include="..\..\include\wx\activityindicator.h" />
|
||||
<ClInclude Include="..\..\include\wx\richtooltip.h" />
|
||||
<ClInclude Include="..\..\include\wx\generic\gridsel.h" />
|
||||
<ClInclude Include="..\..\include\wx\dcbuffer.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@@ -33,12 +33,18 @@
|
||||
<ClCompile Include="..\..\src\common\accesscmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\addremovectrl.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\affinematrix2d.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\anidecod.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\animatecmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\appcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -57,6 +63,9 @@
|
||||
<ClCompile Include="..\..\src\common\bmpbtncmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\bookctrl.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -66,6 +75,9 @@
|
||||
<ClCompile Include="..\..\src\common\cairo.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\calctrlcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\checkboxcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -108,6 +120,9 @@
|
||||
<ClCompile Include="..\..\src\common\ctrlsub.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\datavcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\dcbase.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -210,6 +225,9 @@
|
||||
<ClCompile Include="..\..\src\common\graphcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\gridcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\headercolcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -219,6 +237,9 @@
|
||||
<ClCompile Include="..\..\src\common\helpbase.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\iconbndl.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -291,6 +312,12 @@
|
||||
<ClCompile Include="..\..\src\common\nbkbase.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\odcombocmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\overlaycmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -336,6 +363,9 @@
|
||||
<ClCompile Include="..\..\src\common\rgncmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\scrolbarcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -375,6 +405,9 @@
|
||||
<ClCompile Include="..\..\src\common\stockitem.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\taskbarcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\tbarbase.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -423,12 +456,30 @@
|
||||
<ClCompile Include="..\..\src\common\xpmdecod.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\activityindicator.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\animateg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\bannerwindow.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\busyinfo.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\buttonbar.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\calctrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\choicbkg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -447,6 +498,15 @@
|
||||
<ClCompile Include="..\..\src\generic\combog.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datavgen.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datectlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\dcpsg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -456,6 +516,9 @@
|
||||
<ClCompile Include="..\..\src\generic\dragimgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\editlbox.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\filectrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -468,12 +531,33 @@
|
||||
<ClCompile Include="..\..\src\generic\graphicc.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\grid.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridctrl.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\grideditors.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridsel.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\headerctrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\helpext.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\infobar.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\laywin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\listbkg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -486,9 +570,15 @@
|
||||
<ClCompile Include="..\..\src\generic\msgdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\notifmsgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\numdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\odcombo.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\preferencesg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -501,12 +591,21 @@
|
||||
<ClCompile Include="..\..\src\generic\progdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\propdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\renderg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\richmsgdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\richtooltipg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\sashwin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\scrlwing.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -516,6 +615,9 @@
|
||||
<ClCompile Include="..\..\src\generic\spinctlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\splash.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\splitter.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -534,6 +636,12 @@
|
||||
<ClCompile Include="..\..\src\generic\textdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\timectrlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\tipdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\tipwin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -546,12 +654,21 @@
|
||||
<ClCompile Include="..\..\src\generic\treectlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\treelist.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\vlbox.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\vscroll.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\wizard.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\aboutdlg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\accel.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -573,12 +690,18 @@
|
||||
<ClCompile Include="..\..\src\msw\bmpbuttn.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\bmpcbox.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\brush.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\button.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\calctrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\caret.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -606,6 +729,9 @@
|
||||
<ClCompile Include="..\..\src\msw\combobox.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\control.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -618,6 +744,15 @@
|
||||
<ClCompile Include="..\..\src\msw\data.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datecontrols.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datetimectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\dc.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -705,6 +840,9 @@
|
||||
<ClCompile Include="..\..\src\msw\helpwin.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\hyperlink.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\icon.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -714,6 +852,9 @@
|
||||
<ClCompile Include="..\..\src\msw\iniconf.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\joystick.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\listbox.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -753,6 +894,9 @@
|
||||
<ClCompile Include="..\..\src\msw\notebook.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\notifmsg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\ole\access.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -819,6 +963,12 @@
|
||||
<ClCompile Include="..\..\src\msw\richmsgdlg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\richtooltip.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\rt\utilsrt.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -831,6 +981,9 @@
|
||||
<ClCompile Include="..\..\src\msw\slider.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\sound.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\spinbutt.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -855,6 +1008,9 @@
|
||||
<ClCompile Include="..\..\src\msw\systhemectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\taskbar.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -870,6 +1026,9 @@
|
||||
<ClCompile Include="..\..\src\msw\tglbtn.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\timectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\toolbar.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -910,12 +1069,21 @@
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\include\wx\aboutdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\accel.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\access.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\activityindicator.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\addremovectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\affinematrix2d.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -925,6 +1093,9 @@
|
||||
<ClInclude Include="..\..\include\wx\anidecod.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\animate.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\animdecod.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -937,12 +1108,18 @@
|
||||
<ClInclude Include="..\..\include\wx\artprov.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bannerwindow.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bitmap.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bmpbuttn.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bmpcbox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bookctrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -955,6 +1132,9 @@
|
||||
<ClInclude Include="..\..\include\wx\button.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\calctrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\caret.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1006,6 +1186,9 @@
|
||||
<ClInclude Include="..\..\include\wx\combobox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\commandlinkbutton.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\compositewin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1027,9 +1210,24 @@
|
||||
<ClInclude Include="..\..\include\wx\dataobj.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dataview.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\datectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dateevt.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\datetimectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dc.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dcbuffer.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dcclient.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1084,6 +1282,12 @@
|
||||
<ClInclude Include="..\..\include\wx\dragimag.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dvrenderers.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\editlbox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\effects.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1141,15 +1345,30 @@
|
||||
<ClInclude Include="..\..\include\wx\gdiobj.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\accel.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\activityindicator.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\animate.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\busyinfo.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\buttonbar.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\calctrlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\choicdgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1168,6 +1387,12 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\custombgwin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dataview.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\datectrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dcpsg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1177,6 +1402,12 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\dragimgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\filectrlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1186,12 +1417,33 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\fontpickerg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\grid.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridctrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\grideditors.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridsel.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\headerctrlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\helpext.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\hyperlink.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\infobar.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\laywin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\logg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1201,6 +1453,9 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\notebook.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\notifmsg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\numdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1216,15 +1471,24 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\progdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\propdlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\richmsgdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\sashwin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\scrolwin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\spinctlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\splash.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\splitter.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1240,9 +1504,15 @@
|
||||
<ClInclude Include="..\..\include\wx\generic\textdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\timectrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\treectlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\wizard.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\geometry.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1252,6 +1522,9 @@
|
||||
<ClInclude Include="..\..\include\wx\graphics.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\grid.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\headercol.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1270,6 +1543,9 @@
|
||||
<ClInclude Include="..\..\include\wx\helpwin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\hyperlink.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\icon.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1321,9 +1597,15 @@
|
||||
<ClInclude Include="..\..\include\wx\itemid.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\joystick.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\layout.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\laywin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\listbase.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1381,12 +1663,18 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\bmpbuttn.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\brush.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\button.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\caret.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1414,6 +1702,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\combobox.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\control.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1426,6 +1717,12 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\custombgwin.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\dc.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1492,6 +1789,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\htmlhelp.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\icon.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1504,6 +1804,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\init.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\joystick.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\listbox.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1627,6 +1930,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\slider.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\sound.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\spinbutt.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1648,6 +1954,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\statusbar.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbar.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1660,6 +1969,9 @@
|
||||
<ClInclude Include="..\..\include\wx\msw\tglbtn.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\timectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\toolbar.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1687,9 +1999,15 @@
|
||||
<ClInclude Include="..\..\include\wx\notebook.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\notifmsg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\numdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\odcombo.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\overlay.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1756,6 +2074,9 @@
|
||||
<ClInclude Include="..\..\include\wx\progdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\propdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\quantize.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1783,6 +2104,12 @@
|
||||
<ClInclude Include="..\..\include\wx\richmsgdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\richtooltip.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sashwin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\scopeguard.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1807,12 +2134,18 @@
|
||||
<ClInclude Include="..\..\include\wx\slider.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sound.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\spinbutt.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\spinctrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\splash.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\splitter.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1837,6 +2170,9 @@
|
||||
<ClInclude Include="..\..\include\wx\systhemectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\taskbar.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\taskbarbutton.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1864,6 +2200,12 @@
|
||||
<ClInclude Include="..\..\include\wx\tglbtn.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\timectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\tipdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\tipwin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1888,6 +2230,9 @@
|
||||
<ClInclude Include="..\..\include\wx\treectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\treelist.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\uiaction.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
@@ -1927,6 +2272,9 @@
|
||||
<ClInclude Include="..\..\include\wx\withimages.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\wizard.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\wrapsizer.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
|
||||
@@ -276,21 +276,6 @@
|
||||
<Filter
|
||||
Name="Common Sources"
|
||||
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dummy.cpp">
|
||||
<FileConfiguration
|
||||
@@ -318,73 +303,10 @@
|
||||
UsePrecompiledHeader="1"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\version.rc">
|
||||
<FileConfiguration
|
||||
@@ -395,91 +317,6 @@
|
||||
ExcludedFromBuild="TRUE"/>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">
|
||||
@@ -533,21 +370,6 @@
|
||||
<Filter
|
||||
Name="MSW Headers"
|
||||
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\bmpcbox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\calctrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datetimectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\genrcdefs.h">
|
||||
<FileConfiguration
|
||||
@@ -587,188 +409,6 @@
|
||||
AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\hyperlink.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\joystick.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\sound.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\taskbar.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\timectrl.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Headers"
|
||||
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\aboutdlgg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\activityindicator.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\animate.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\bmpcbox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\calctrlg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dataview.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\datectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderer.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderers.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grid.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridctrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grideditors.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridsel.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\helpext.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\hyperlink.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\laywin.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\notifmsg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\propdlg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\sashwin.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\splash.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\timectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\wizard.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Common Headers"
|
||||
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
|
||||
<File
|
||||
RelativePath="..\..\include\wx\aboutdlg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\activityindicator.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\addremovectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\animate.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bannerwindow.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bmpcbox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\calctrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\commandlinkbutton.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dataview.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dateevt.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datetimectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dcbuffer.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dvrenderers.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\editlbox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\grid.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\hyperlink.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\joystick.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\laywin.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\notifmsg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\odcombo.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\propdlg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\richtooltip.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sashwin.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sound.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\splash.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\taskbar.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timectrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\tipdlg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treelist.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\wizard.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
|
||||
@@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
|
||||
|
||||
@@ -282,12 +282,18 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\accesscmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\affinematrix2d.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\anidecod.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\appcmn.cpp">
|
||||
</File>
|
||||
@@ -306,6 +312,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpbtncmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bookctrl.cpp">
|
||||
</File>
|
||||
@@ -315,6 +324,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\cairo.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\checkboxcmn.cpp">
|
||||
</File>
|
||||
@@ -357,6 +369,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\ctrlsub.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dcbase.cpp">
|
||||
</File>
|
||||
@@ -483,6 +498,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\graphcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\headercolcmn.cpp">
|
||||
</File>
|
||||
@@ -492,6 +510,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\helpbase.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\iconbndl.cpp">
|
||||
</File>
|
||||
@@ -564,6 +585,12 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\nbkbase.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\overlaycmn.cpp">
|
||||
</File>
|
||||
@@ -609,6 +636,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\rgncmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\scrolbarcmn.cpp">
|
||||
</File>
|
||||
@@ -648,6 +678,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\stockitem.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\tbarbase.cpp">
|
||||
</File>
|
||||
@@ -700,6 +733,9 @@
|
||||
<Filter
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\accel.cpp">
|
||||
</File>
|
||||
@@ -730,12 +766,18 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpbuttn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\brush.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\button.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\caret.cpp">
|
||||
</File>
|
||||
@@ -766,6 +808,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\comimpl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\control.cpp">
|
||||
</File>
|
||||
@@ -781,6 +826,15 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\dataobj.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\dc.cpp">
|
||||
</File>
|
||||
@@ -874,6 +928,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\helpwin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\icon.cpp">
|
||||
</File>
|
||||
@@ -883,6 +940,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\iniconf.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\listbox.cpp">
|
||||
</File>
|
||||
@@ -922,6 +982,12 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notebook.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\oleutils.cpp">
|
||||
</File>
|
||||
@@ -961,6 +1027,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richmsgdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\safearray.cpp">
|
||||
</File>
|
||||
@@ -973,6 +1042,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\slider.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\spinbutt.cpp">
|
||||
</File>
|
||||
@@ -997,6 +1069,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\systhemectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbarbutton.cpp">
|
||||
</File>
|
||||
@@ -1012,6 +1087,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\msw\tglbtn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\toolbar.cpp">
|
||||
</File>
|
||||
@@ -1061,12 +1139,30 @@
|
||||
<Filter
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\busyinfo.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\buttonbar.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\choicbkg.cpp">
|
||||
</File>
|
||||
@@ -1085,6 +1181,15 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\combog.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\dcpsg.cpp">
|
||||
</File>
|
||||
@@ -1094,6 +1199,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\dragimgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\filectrlg.cpp">
|
||||
</File>
|
||||
@@ -1106,12 +1214,33 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\graphicc.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\headerctrlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\infobar.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\listbkg.cpp">
|
||||
</File>
|
||||
@@ -1124,9 +1253,15 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\msgdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\numdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\preferencesg.cpp">
|
||||
</File>
|
||||
@@ -1139,12 +1274,21 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\progdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\renderg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richmsgdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\scrlwing.cpp">
|
||||
</File>
|
||||
@@ -1154,6 +1298,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\spinctlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splitter.cpp">
|
||||
</File>
|
||||
@@ -1172,6 +1319,12 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\textdlgg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipwin.cpp">
|
||||
</File>
|
||||
@@ -1184,12 +1337,18 @@
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treectlg.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\vlbox.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\vscroll.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
|
||||
@@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
|
||||
@@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
|
||||
@@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
|
||||
@@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
|
||||
|
||||
@@ -741,26 +741,6 @@
|
||||
Name="Common Sources"
|
||||
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dummy.cpp"
|
||||
>
|
||||
@@ -829,95 +809,11 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\version.rc"
|
||||
>
|
||||
@@ -939,119 +835,6 @@
|
||||
/>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
|
||||
@@ -1173,26 +956,6 @@
|
||||
Name="MSW Headers"
|
||||
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\calctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datetimectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\genrcdefs.h"
|
||||
>
|
||||
@@ -1285,248 +1048,6 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\joystick.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\sound.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\taskbar.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Headers"
|
||||
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\activityindicator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\animate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\calctrlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dataview.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderers.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grid.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grideditors.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridsel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\helpext.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\laywin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\notifmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\propdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\sashwin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\splash.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\wizard.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Common Headers"
|
||||
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\aboutdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\activityindicator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\addremovectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\animate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bannerwindow.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\calctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\commandlinkbutton.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dataview.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dateevt.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datetimectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dcbuffer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dvrenderers.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\editlbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\grid.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\joystick.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\laywin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\notifmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\odcombo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\propdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\richtooltip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sashwin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sound.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\splash.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\taskbar.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\tipdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treelist.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\wizard.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
|
||||
@@ -344,7 +344,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
|
||||
@@ -607,7 +607,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
|
||||
@@ -698,7 +698,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
|
||||
|
||||
@@ -749,6 +749,10 @@
|
||||
RelativePath="..\..\src\common\accesscmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\affinematrix2d.cpp"
|
||||
>
|
||||
@@ -757,6 +761,10 @@
|
||||
RelativePath="..\..\src\common\anidecod.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\appcmn.cpp"
|
||||
>
|
||||
@@ -781,6 +789,10 @@
|
||||
RelativePath="..\..\src\common\bmpbtncmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bookctrl.cpp"
|
||||
>
|
||||
@@ -793,6 +805,10 @@
|
||||
RelativePath="..\..\src\common\cairo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\checkboxcmn.cpp"
|
||||
>
|
||||
@@ -849,6 +865,10 @@
|
||||
RelativePath="..\..\src\common\ctrlsub.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dcbase.cpp"
|
||||
>
|
||||
@@ -1049,6 +1069,10 @@
|
||||
RelativePath="..\..\src\common\graphcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\headercolcmn.cpp"
|
||||
>
|
||||
@@ -1061,6 +1085,10 @@
|
||||
RelativePath="..\..\src\common\helpbase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\iconbndl.cpp"
|
||||
>
|
||||
@@ -1157,6 +1185,14 @@
|
||||
RelativePath="..\..\src\common\nbkbase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\overlaycmn.cpp"
|
||||
>
|
||||
@@ -1217,6 +1253,10 @@
|
||||
RelativePath="..\..\src\common\rgncmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\scrolbarcmn.cpp"
|
||||
>
|
||||
@@ -1269,6 +1309,10 @@
|
||||
RelativePath="..\..\src\common\stockitem.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\tbarbase.cpp"
|
||||
>
|
||||
@@ -1338,6 +1382,10 @@
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\accel.cpp"
|
||||
>
|
||||
@@ -1378,6 +1426,10 @@
|
||||
RelativePath="..\..\src\msw\bmpbuttn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\brush.cpp"
|
||||
>
|
||||
@@ -1386,6 +1438,10 @@
|
||||
RelativePath="..\..\src\msw\button.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\caret.cpp"
|
||||
>
|
||||
@@ -1426,6 +1482,10 @@
|
||||
RelativePath="..\..\src\msw\ole\comimpl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\control.cpp"
|
||||
>
|
||||
@@ -1446,6 +1506,18 @@
|
||||
RelativePath="..\..\src\msw\ole\dataobj.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\dc.cpp"
|
||||
>
|
||||
@@ -1570,6 +1642,10 @@
|
||||
RelativePath="..\..\src\msw\helpwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\icon.cpp"
|
||||
>
|
||||
@@ -1582,6 +1658,10 @@
|
||||
RelativePath="..\..\src\msw\iniconf.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\listbox.cpp"
|
||||
>
|
||||
@@ -1634,6 +1714,14 @@
|
||||
RelativePath="..\..\src\msw\notebook.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\oleutils.cpp"
|
||||
>
|
||||
@@ -1686,6 +1774,10 @@
|
||||
RelativePath="..\..\src\msw\richmsgdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\safearray.cpp"
|
||||
>
|
||||
@@ -1702,6 +1794,10 @@
|
||||
RelativePath="..\..\src\msw\slider.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\spinbutt.cpp"
|
||||
>
|
||||
@@ -1734,6 +1830,10 @@
|
||||
RelativePath="..\..\src\msw\systhemectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbarbutton.cpp"
|
||||
>
|
||||
@@ -1754,6 +1854,10 @@
|
||||
RelativePath="..\..\src\msw\tglbtn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\toolbar.cpp"
|
||||
>
|
||||
@@ -1827,6 +1931,26 @@
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\busyinfo.cpp"
|
||||
>
|
||||
@@ -1835,6 +1959,10 @@
|
||||
RelativePath="..\..\src\generic\buttonbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\choicbkg.cpp"
|
||||
>
|
||||
@@ -1859,6 +1987,18 @@
|
||||
RelativePath="..\..\src\generic\combog.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\dcpsg.cpp"
|
||||
>
|
||||
@@ -1871,6 +2011,10 @@
|
||||
RelativePath="..\..\src\generic\dragimgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\filectrlg.cpp"
|
||||
>
|
||||
@@ -1887,14 +2031,42 @@
|
||||
RelativePath="..\..\src\generic\graphicc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\headerctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\infobar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\listbkg.cpp"
|
||||
>
|
||||
@@ -1911,10 +2083,18 @@
|
||||
RelativePath="..\..\src\generic\msgdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\numdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\preferencesg.cpp"
|
||||
>
|
||||
@@ -1931,6 +2111,10 @@
|
||||
RelativePath="..\..\src\generic\progdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\renderg.cpp"
|
||||
>
|
||||
@@ -1939,6 +2123,14 @@
|
||||
RelativePath="..\..\src\generic\richmsgdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\scrlwing.cpp"
|
||||
>
|
||||
@@ -1951,6 +2143,10 @@
|
||||
RelativePath="..\..\src\generic\spinctlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splitter.cpp"
|
||||
>
|
||||
@@ -1975,6 +2171,14 @@
|
||||
RelativePath="..\..\src\generic\textdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipwin.cpp"
|
||||
>
|
||||
@@ -1991,6 +2195,10 @@
|
||||
RelativePath="..\..\src\generic\treectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\vlbox.cpp"
|
||||
>
|
||||
@@ -1999,6 +2207,10 @@
|
||||
RelativePath="..\..\src\generic\vscroll.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
|
||||
@@ -344,7 +344,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
|
||||
@@ -607,7 +607,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
|
||||
@@ -698,7 +698,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
|
||||
@@ -344,7 +344,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
|
||||
@@ -607,7 +607,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
|
||||
@@ -698,7 +698,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
|
||||
@@ -344,7 +344,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
|
||||
@@ -607,7 +607,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
|
||||
@@ -698,7 +698,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
|
||||
@@ -344,7 +344,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
|
||||
@@ -607,7 +607,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
|
||||
@@ -698,7 +698,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
|
||||
|
||||
@@ -737,26 +737,6 @@
|
||||
Name="Common Sources"
|
||||
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dummy.cpp"
|
||||
>
|
||||
@@ -825,95 +805,11 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\version.rc"
|
||||
>
|
||||
@@ -935,119 +831,6 @@
|
||||
/>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
|
||||
@@ -1169,26 +952,6 @@
|
||||
Name="MSW Headers"
|
||||
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\calctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\datetimectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\genrcdefs.h"
|
||||
>
|
||||
@@ -1281,248 +1044,6 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\joystick.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\sound.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\taskbar.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Generic Headers"
|
||||
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\activityindicator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\animate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\calctrlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dataview.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\dvrenderers.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grid.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\grideditors.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\gridsel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\helpext.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\laywin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\notifmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\propdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\sashwin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\splash.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\generic\wizard.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Common Headers"
|
||||
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\aboutdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\activityindicator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\addremovectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\animate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bannerwindow.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\calctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\commandlinkbutton.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dataview.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dateevt.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\datetimectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dcbuffer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\dvrenderers.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\editlbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\grid.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\hyperlink.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\joystick.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\laywin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\notifmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\odcombo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\propdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\richtooltip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sashwin.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\sound.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\splash.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\taskbar.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\timectrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\tipdlg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treelist.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\wizard.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
|
||||
@@ -342,7 +342,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
|
||||
@@ -603,7 +603,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
|
||||
@@ -694,7 +694,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
|
||||
|
||||
@@ -745,6 +745,10 @@
|
||||
RelativePath="..\..\src\common\accesscmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\addremovectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\affinematrix2d.cpp"
|
||||
>
|
||||
@@ -753,6 +757,10 @@
|
||||
RelativePath="..\..\src\common\anidecod.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\animatecmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\appcmn.cpp"
|
||||
>
|
||||
@@ -777,6 +785,10 @@
|
||||
RelativePath="..\..\src\common\bmpbtncmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\bookctrl.cpp"
|
||||
>
|
||||
@@ -789,6 +801,10 @@
|
||||
RelativePath="..\..\src\common\cairo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\calctrlcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\checkboxcmn.cpp"
|
||||
>
|
||||
@@ -845,6 +861,10 @@
|
||||
RelativePath="..\..\src\common\ctrlsub.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\datavcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\dcbase.cpp"
|
||||
>
|
||||
@@ -1045,6 +1065,10 @@
|
||||
RelativePath="..\..\src\common\graphcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\gridcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\headercolcmn.cpp"
|
||||
>
|
||||
@@ -1057,6 +1081,10 @@
|
||||
RelativePath="..\..\src\common\helpbase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\iconbndl.cpp"
|
||||
>
|
||||
@@ -1153,6 +1181,14 @@
|
||||
RelativePath="..\..\src\common\nbkbase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\notifmsgcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\odcombocmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\overlaycmn.cpp"
|
||||
>
|
||||
@@ -1213,6 +1249,10 @@
|
||||
RelativePath="..\..\src\common\rgncmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\richtooltipcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\scrolbarcmn.cpp"
|
||||
>
|
||||
@@ -1265,6 +1305,10 @@
|
||||
RelativePath="..\..\src\common\stockitem.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\taskbarcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\tbarbase.cpp"
|
||||
>
|
||||
@@ -1334,6 +1378,10 @@
|
||||
Name="MSW Sources"
|
||||
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\aboutdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\accel.cpp"
|
||||
>
|
||||
@@ -1374,6 +1422,10 @@
|
||||
RelativePath="..\..\src\msw\bmpbuttn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\bmpcbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\brush.cpp"
|
||||
>
|
||||
@@ -1382,6 +1434,10 @@
|
||||
RelativePath="..\..\src\msw\button.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\calctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\caret.cpp"
|
||||
>
|
||||
@@ -1422,6 +1478,10 @@
|
||||
RelativePath="..\..\src\msw\ole\comimpl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\control.cpp"
|
||||
>
|
||||
@@ -1442,6 +1502,18 @@
|
||||
RelativePath="..\..\src\msw\ole\dataobj.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datecontrols.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\datetimectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\dc.cpp"
|
||||
>
|
||||
@@ -1566,6 +1638,10 @@
|
||||
RelativePath="..\..\src\msw\helpwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\hyperlink.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\icon.cpp"
|
||||
>
|
||||
@@ -1578,6 +1654,10 @@
|
||||
RelativePath="..\..\src\msw\iniconf.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\joystick.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\listbox.cpp"
|
||||
>
|
||||
@@ -1630,6 +1710,14 @@
|
||||
RelativePath="..\..\src\msw\notebook.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\notifmsg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\oleutils.cpp"
|
||||
>
|
||||
@@ -1682,6 +1770,10 @@
|
||||
RelativePath="..\..\src\msw\richmsgdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\richtooltip.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\ole\safearray.cpp"
|
||||
>
|
||||
@@ -1698,6 +1790,10 @@
|
||||
RelativePath="..\..\src\msw\slider.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\sound.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\spinbutt.cpp"
|
||||
>
|
||||
@@ -1730,6 +1826,10 @@
|
||||
RelativePath="..\..\src\msw\systhemectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\taskbarbutton.cpp"
|
||||
>
|
||||
@@ -1750,6 +1850,10 @@
|
||||
RelativePath="..\..\src\msw\tglbtn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\timectrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\msw\toolbar.cpp"
|
||||
>
|
||||
@@ -1823,6 +1927,26 @@
|
||||
Name="Generic Sources"
|
||||
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\aboutdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\activityindicator.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\animateg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bannerwindow.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\bmpcboxg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\busyinfo.cpp"
|
||||
>
|
||||
@@ -1831,6 +1955,10 @@
|
||||
RelativePath="..\..\src\generic\buttonbar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\calctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\choicbkg.cpp"
|
||||
>
|
||||
@@ -1855,6 +1983,18 @@
|
||||
RelativePath="..\..\src\generic\combog.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datavgen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\datectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\dcpsg.cpp"
|
||||
>
|
||||
@@ -1867,6 +2007,10 @@
|
||||
RelativePath="..\..\src\generic\dragimgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\editlbox.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\filectrlg.cpp"
|
||||
>
|
||||
@@ -1883,14 +2027,42 @@
|
||||
RelativePath="..\..\src\generic\graphicc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grid.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridctrl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\grideditors.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\gridsel.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\headerctrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\helpext.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\hyperlinkg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\infobar.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\laywin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\listbkg.cpp"
|
||||
>
|
||||
@@ -1907,10 +2079,18 @@
|
||||
RelativePath="..\..\src\generic\msgdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\notifmsgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\numdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\odcombo.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\preferencesg.cpp"
|
||||
>
|
||||
@@ -1927,6 +2107,10 @@
|
||||
RelativePath="..\..\src\generic\progdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\propdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\renderg.cpp"
|
||||
>
|
||||
@@ -1935,6 +2119,14 @@
|
||||
RelativePath="..\..\src\generic\richmsgdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\richtooltipg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\sashwin.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\scrlwing.cpp"
|
||||
>
|
||||
@@ -1947,6 +2139,10 @@
|
||||
RelativePath="..\..\src\generic\spinctlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splash.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\splitter.cpp"
|
||||
>
|
||||
@@ -1971,6 +2167,14 @@
|
||||
RelativePath="..\..\src\generic\textdlgg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\timectrlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipdlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\tipwin.cpp"
|
||||
>
|
||||
@@ -1987,6 +2191,10 @@
|
||||
RelativePath="..\..\src\generic\treectlg.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\treelist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\vlbox.cpp"
|
||||
>
|
||||
@@ -1995,6 +2203,10 @@
|
||||
RelativePath="..\..\src\generic\vscroll.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\generic\wizard.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
|
||||
@@ -342,7 +342,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
|
||||
@@ -603,7 +603,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
|
||||
@@ -694,7 +694,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
|
||||
@@ -342,7 +342,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
|
||||
@@ -603,7 +603,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
|
||||
@@ -694,7 +694,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
|
||||
@@ -342,7 +342,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
|
||||
@@ -603,7 +603,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
|
||||
@@ -694,7 +694,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
|
||||
@@ -342,7 +342,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
|
||||
@@ -603,7 +603,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
|
||||
LinkIncremental="2"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
|
||||
@@ -694,7 +694,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
|
||||
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
|
||||
LinkIncremental="1"
|
||||
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
|
||||
|
||||
108
configure
vendored
108
configure
vendored
@@ -665,7 +665,6 @@ COND_wxUSE_LIBPNG_builtin
|
||||
COND_wxUSE_LIBJPEG_builtin
|
||||
COND_wxUSE_EXPAT_builtin
|
||||
COND_WXUNIV_1
|
||||
COND_WXUNIV_0
|
||||
COND_WITH_PLUGIN_SDL_1
|
||||
COND_WINDOWS_IMPLIB_1
|
||||
COND_USE_XRC_1
|
||||
@@ -696,18 +695,17 @@ COND_USE_EXCEPTIONS_1
|
||||
COND_USE_EXCEPTIONS_0
|
||||
COND_USE_CAIRO_1
|
||||
COND_UNICODE_1
|
||||
COND_TOOLKIT_X11_WXUNIV_1
|
||||
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
|
||||
COND_TOOLKIT_X11_USE_GUI_1
|
||||
COND_TOOLKIT_X11
|
||||
COND_TOOLKIT_Qt
|
||||
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_QT_USE_GUI_1
|
||||
COND_TOOLKIT_QT
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_IPHONE
|
||||
COND_TOOLKIT_OSX_COCOA_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_COCOA
|
||||
COND_TOOLKIT_OSX_CARBON
|
||||
@@ -721,16 +719,12 @@ COND_TOOLKIT_MAC
|
||||
COND_TOOLKIT_GTK_USE_GUI_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
|
||||
@@ -739,7 +733,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
|
||||
COND_TOOLKIT_GTK
|
||||
COND_TOOLKIT_DFB_USE_GUI_1
|
||||
COND_TOOLKIT_DFB
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1
|
||||
COND_TOOLKIT_COCOA
|
||||
COND_TOOLKIT_
|
||||
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
|
||||
@@ -758,11 +751,8 @@ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
|
||||
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
|
||||
COND_SHARED_0
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
|
||||
COND_PLATFORM_WIN32_1_SHARED_0
|
||||
COND_PLATFORM_WIN32_1
|
||||
COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4
|
||||
@@ -771,11 +761,8 @@ COND_PLATFORM_WIN32_0
|
||||
COND_PLATFORM_UNIX_1_USE_PLUGINS_0
|
||||
COND_PLATFORM_UNIX_1_USE_GUI_1
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
|
||||
COND_PLATFORM_UNIX_1
|
||||
COND_PLATFORM_UNIX_0
|
||||
COND_PLATFORM_OS2_1
|
||||
@@ -787,11 +774,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
|
||||
COND_PLATFORM_MACOSX_1
|
||||
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
|
||||
@@ -40992,31 +40976,16 @@ EOF
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
|
||||
@@ -41072,31 +41041,16 @@ EOF
|
||||
COND_PLATFORM_UNIX_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
|
||||
@@ -41137,31 +41091,16 @@ EOF
|
||||
COND_PLATFORM_WIN32_1_SHARED_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
|
||||
@@ -41252,11 +41191,6 @@ EOF
|
||||
COND_TOOLKIT_COCOA=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_DFB="#"
|
||||
if test "x$TOOLKIT" = "xDFB" ; then
|
||||
COND_TOOLKIT_DFB=""
|
||||
@@ -41297,16 +41231,6 @@ EOF
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
|
||||
@@ -41322,11 +41246,6 @@ EOF
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
|
||||
@@ -41342,11 +41261,6 @@ EOF
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
|
||||
@@ -41412,6 +41326,11 @@ EOF
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_COCOA_WXUNIV_0=""
|
||||
@@ -41437,11 +41356,6 @@ EOF
|
||||
COND_TOOLKIT_QT=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_QT_USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_QT_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
|
||||
@@ -41467,11 +41381,6 @@ EOF
|
||||
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_X11_WXUNIV_1="#"
|
||||
if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
|
||||
COND_TOOLKIT_X11_WXUNIV_1=""
|
||||
fi
|
||||
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
COND_UNICODE_1=""
|
||||
@@ -41622,11 +41531,6 @@ EOF
|
||||
COND_WITH_PLUGIN_SDL_1=""
|
||||
fi
|
||||
|
||||
COND_WXUNIV_0="#"
|
||||
if test "x$WXUNIV" = "x0" ; then
|
||||
COND_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
COND_WXUNIV_1=""
|
||||
|
||||
@@ -32,7 +32,6 @@ EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_HTML = @EXTRALIBS_HTML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
@@ -64,7 +63,6 @@ FORTY_OBJECTS = \
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -109,9 +107,6 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
|
||||
COND_MONOLITHIC_0___WXLIB_HTML_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
COND_MONOLITHIC_0___WXLIB_XML_p = \
|
||||
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
|
||||
@@ -165,7 +160,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
|
||||
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(__forty___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
scorefil.cpp
|
||||
</sources>
|
||||
<wx-lib>html</wx-lib>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -108,7 +108,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -175,7 +175,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -237,7 +237,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -276,7 +276,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -370,7 +370,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -469,7 +469,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -563,7 +563,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -662,7 +662,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -756,7 +756,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -173,7 +173,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -268,7 +268,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -359,7 +359,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -454,7 +454,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -545,7 +545,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -640,7 +640,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\forty.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -731,7 +731,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\forty.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -175,10 +175,6 @@ __WXLIB_HTML_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_XML_p = \
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
|
||||
!endif
|
||||
@@ -247,7 +243,7 @@ clean:
|
||||
|
||||
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
|
||||
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
|
||||
c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
|
||||
c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
|
||||
|
|
||||
|
||||
data:
|
||||
|
||||
@@ -160,10 +160,6 @@ __WXLIB_HTML_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_ADV_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_XML_p = \
|
||||
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
|
||||
endif
|
||||
@@ -237,7 +233,7 @@ clean:
|
||||
-if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
|
||||
|
||||
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
|
||||
$(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
$(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
|
||||
data:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
|
||||
@@ -313,10 +313,6 @@ __WXLIB_HTML_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_XML_p = \
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
|
||||
!endif
|
||||
@@ -370,7 +366,7 @@ clean:
|
||||
|
||||
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
|
||||
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
<<
|
||||
|
||||
data:
|
||||
|
||||
@@ -101,6 +101,8 @@ All:
|
||||
|
||||
All (GUI):
|
||||
|
||||
- wxAdvanced library was merged into wxCore, simply remove all references
|
||||
to "adv" from your build system, it is not needed any longer.
|
||||
- Add wxDataViewToggleRenderer::ShowAsRadio().
|
||||
- Improve stock items consistency and aesthetics (dhowland).
|
||||
- Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
|
||||
|
||||
@@ -29,7 +29,6 @@ digraph Dependencies
|
||||
wxNet [fillcolor = deepskyblue, URL = "\ref page_libs_wxnet"];
|
||||
wxXML [fillcolor = deepskyblue, URL = "\ref page_libs_wxxml"];
|
||||
|
||||
wxAdvanced [fillcolor = green, URL = "\ref page_libs_wxadv"];
|
||||
wxAUI [fillcolor = green, URL = "\ref page_libs_wxaui"];
|
||||
wxGL [fillcolor = green, URL = "\ref page_libs_wxgl"];
|
||||
wxHTML [fillcolor = green, URL = "\ref page_libs_wxhtml"];
|
||||
@@ -46,17 +45,16 @@ digraph Dependencies
|
||||
wxNet -> wxBase;
|
||||
wxXML -> wxBase;
|
||||
|
||||
wxAdvanced -> wxCore;
|
||||
wxAUI -> wxAdvanced; wxAUI -> wxHTML;
|
||||
wxAUI -> wxCore; wxAUI -> wxHTML;
|
||||
wxGL -> wxCore;
|
||||
wxHTML -> wxCore;
|
||||
wxMedia -> wxCore;
|
||||
wxPropertyGrid -> wxAdvanced;
|
||||
wxPropertyGrid -> wxCore;
|
||||
wxQA -> wxCore; wxQA -> wxXML;
|
||||
wxRibbon -> wxCore;
|
||||
wxRichText -> wxAdvanced; wxRichText -> wxHTML; wxRichText -> wxXML;
|
||||
wxRichText -> wxCore; wxRichText -> wxHTML; wxRichText -> wxXML;
|
||||
wxSTC -> wxCore;
|
||||
wxXRC -> wxAdvanced; wxXRC -> wxHTML; wxXRC -> wxXML;
|
||||
wxXRC -> wxCore; wxXRC -> wxHTML; wxXRC -> wxXML;
|
||||
wxWebView -> wxCore;
|
||||
}
|
||||
@enddot
|
||||
@@ -66,32 +64,17 @@ libraries depend on the @ref page_libs_wxbase library (i.e. they are non-GUI
|
||||
libraries), and all green libraries depend on the @ref page_libs_wxcore library
|
||||
(i.e. they are GUI libraries).
|
||||
|
||||
|
||||
|
||||
@section page_libs_wxadv wxAdvanced
|
||||
|
||||
Advanced or rarely used GUI classes:
|
||||
|
||||
@li wxCalendarCtrl
|
||||
@li wxGrid classes
|
||||
@li wxJoystick
|
||||
@li wxLayoutAlgorithm
|
||||
@li wxSplashScreen
|
||||
@li wxTaskBarIcon
|
||||
@li wxSound
|
||||
@li wxWizard
|
||||
@li wxSashLayoutWindow
|
||||
@li wxSashWindow
|
||||
@li ...others
|
||||
|
||||
Requires @ref page_libs_wxcore and @ref page_libs_wxbase.
|
||||
@note Until wxWidgets 3.1.2 some core GUI classes were in a separate wxAdvanced
|
||||
library, but this library was merged into wxCore and, while it's still
|
||||
preserved as an empty library for compatibility, should be never used any
|
||||
longer and will disappear completely in the future.
|
||||
|
||||
|
||||
@section page_libs_wxaui wxAui
|
||||
|
||||
This contains the Advanced User Interface docking library.
|
||||
|
||||
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
@ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
|
||||
@@ -156,7 +139,7 @@ Requires @ref page_libs_wxbase.
|
||||
|
||||
This contains the wxPropertyGrid control.
|
||||
|
||||
Requires @ref page_libs_wxadv, @ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
|
||||
@section page_libs_wxqa wxQA
|
||||
@@ -179,7 +162,7 @@ Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
This contains generic rich text control functionality.
|
||||
|
||||
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
@ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
|
||||
@@ -209,7 +192,7 @@ Requires @ref page_libs_wxbase.
|
||||
This library contains wxXmlResource class that provides access to XML resource
|
||||
files in XRC format.
|
||||
|
||||
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
|
||||
@ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
*/
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
#if wxUSE_ADDREMOVECTRL
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxAddRemoveCtrlNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxAddRemoveCtrlNameStr[];
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxAddRemoveAdaptor: used by wxAddRemoveCtrl to work with the list control
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAddRemoveAdaptor
|
||||
class WXDLLIMPEXP_CORE wxAddRemoveAdaptor
|
||||
{
|
||||
public:
|
||||
// Default ctor and trivial but virtual dtor.
|
||||
@@ -53,7 +53,7 @@ private:
|
||||
// wxAddRemoveCtrl: a list-like control combined with add/remove buttons
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAddRemoveCtrl : public wxPanel
|
||||
class WXDLLIMPEXP_CORE wxAddRemoveCtrl : public wxPanel
|
||||
{
|
||||
public:
|
||||
wxAddRemoveCtrl()
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
#include "wx/timer.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxAnimation;
|
||||
class WXDLLIMPEXP_FWD_CORE wxAnimation;
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxAnimationCtrlNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(wxAnimation) wxNullAnimation;
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[];
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxAnimationBase
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject
|
||||
class WXDLLIMPEXP_CORE wxAnimationBase : public wxObject
|
||||
{
|
||||
public:
|
||||
wxAnimationBase() {}
|
||||
@@ -66,7 +66,7 @@ protected:
|
||||
// auto-resizes by default to fit the new animation when SetAnimation() is called
|
||||
#define wxAC_DEFAULT_STYLE (wxBORDER_NONE)
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
|
||||
class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
|
||||
{
|
||||
public:
|
||||
wxAnimationCtrlBase() { }
|
||||
|
||||
@@ -22,13 +22,13 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxColour;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxBannerWindowNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxBannerWindowNameStr[];
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// A simple banner window showing either a bitmap or text.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxBannerWindow : public wxWindow
|
||||
class WXDLLIMPEXP_CORE wxBannerWindow : public wxWindow
|
||||
{
|
||||
public:
|
||||
// Default constructor, use Create() later.
|
||||
|
||||
@@ -31,10 +31,10 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
#endif
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxBitmapComboBoxNameStr[];
|
||||
|
||||
|
||||
class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
|
||||
class WXDLLIMPEXP_CORE wxBitmapComboBoxBase
|
||||
{
|
||||
public:
|
||||
// ctors and such
|
||||
|
||||
@@ -81,7 +81,7 @@ enum wxCalendarDateBorder
|
||||
// wxCalendarDateAttr: custom attributes for a calendar date
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxCalendarDateAttr
|
||||
class WXDLLIMPEXP_CORE wxCalendarDateAttr
|
||||
{
|
||||
public:
|
||||
// ctors
|
||||
@@ -152,9 +152,9 @@ private:
|
||||
// wxCalendarCtrl events
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCalendarCtrl;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent
|
||||
class WXDLLIMPEXP_CORE wxCalendarEvent : public wxDateEvent
|
||||
{
|
||||
public:
|
||||
wxCalendarEvent() : m_wday(wxDateTime::Inv_WeekDay) { }
|
||||
@@ -179,7 +179,7 @@ private:
|
||||
// wxCalendarCtrlBase
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxCalendarCtrlBase : public wxControl
|
||||
class WXDLLIMPEXP_CORE wxCalendarCtrlBase : public wxControl
|
||||
{
|
||||
public:
|
||||
// do we allow changing the month/year?
|
||||
@@ -366,16 +366,16 @@ protected:
|
||||
// calendar event types and macros for handling them
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_PAGE_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DOUBLECLICKED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_WEEK_CLICKED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_PAGE_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_DOUBLECLICKED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_WEEK_CLICKED, wxCalendarEvent );
|
||||
|
||||
// deprecated events
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_DAY_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_MONTH_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALENDAR_YEAR_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_DAY_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_MONTH_CHANGED, wxCalendarEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALENDAR_YEAR_CHANGED, wxCalendarEvent );
|
||||
|
||||
typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&);
|
||||
|
||||
|
||||
@@ -50,16 +50,16 @@ class WXDLLIMPEXP_FWD_CORE wxHeaderCtrl;
|
||||
// wxDataViewCtrl globals
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewModel;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewModel;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewColumn;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewModelNotifier;
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlAccessible;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlAccessible;
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxDataViewCtrlNameStr[];
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataViewCtrl flags
|
||||
@@ -100,7 +100,7 @@ WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
|
||||
// wxDataViewModelNotifier
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewModelNotifier
|
||||
class WXDLLIMPEXP_CORE wxDataViewModelNotifier
|
||||
{
|
||||
public:
|
||||
wxDataViewModelNotifier() { m_owner = NULL; }
|
||||
@@ -136,7 +136,7 @@ private:
|
||||
|
||||
// TODO: Merge with wxItemAttr somehow.
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewItemAttr
|
||||
class WXDLLIMPEXP_CORE wxDataViewItemAttr
|
||||
{
|
||||
public:
|
||||
// ctors
|
||||
@@ -186,7 +186,7 @@ private:
|
||||
|
||||
typedef wxVector<wxDataViewModelNotifier*> wxDataViewModelNotifiers;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewModel: public wxRefCounter
|
||||
class WXDLLIMPEXP_CORE wxDataViewModel: public wxRefCounter
|
||||
{
|
||||
public:
|
||||
wxDataViewModel();
|
||||
@@ -300,7 +300,7 @@ private:
|
||||
// wxDataViewVirtualListModel
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewListModel : public wxDataViewModel
|
||||
class WXDLLIMPEXP_CORE wxDataViewListModel : public wxDataViewModel
|
||||
{
|
||||
public:
|
||||
// derived classes should override these methods instead of
|
||||
@@ -378,7 +378,7 @@ public:
|
||||
// wxDataViewIndexListModel
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewIndexListModel: public wxDataViewListModel
|
||||
class WXDLLIMPEXP_CORE wxDataViewIndexListModel: public wxDataViewListModel
|
||||
{
|
||||
public:
|
||||
wxDataViewIndexListModel( unsigned int initial_size = 0 );
|
||||
@@ -417,7 +417,7 @@ private:
|
||||
typedef wxDataViewIndexListModel wxDataViewVirtualListModel;
|
||||
#else
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewVirtualListModel: public wxDataViewListModel
|
||||
class WXDLLIMPEXP_CORE wxDataViewVirtualListModel: public wxDataViewListModel
|
||||
{
|
||||
public:
|
||||
wxDataViewVirtualListModel( unsigned int initial_size = 0 );
|
||||
@@ -474,7 +474,7 @@ enum wxDataViewColumnFlags
|
||||
wxDATAVIEW_COL_HIDDEN = wxCOL_HIDDEN
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewColumnBase : public wxSettableHeaderColumn
|
||||
class WXDLLIMPEXP_CORE wxDataViewColumnBase : public wxSettableHeaderColumn
|
||||
{
|
||||
public:
|
||||
// ctor for the text columns: takes ownership of renderer
|
||||
@@ -534,7 +534,7 @@ private:
|
||||
#define wxDV_ROW_LINES 0x0010 // alternating colour in rows
|
||||
#define wxDV_VARIABLE_LINE_HEIGHT 0x0020 // variable line height
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxSystemThemedControl<wxControl>
|
||||
class WXDLLIMPEXP_CORE wxDataViewCtrlBase: public wxSystemThemedControl<wxControl>
|
||||
{
|
||||
public:
|
||||
wxDataViewCtrlBase();
|
||||
@@ -803,7 +803,7 @@ protected:
|
||||
// wxDataViewEvent - the event class for the wxDataViewCtrl notifications
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewEvent : public wxNotifyEvent
|
||||
class WXDLLIMPEXP_CORE wxDataViewEvent : public wxNotifyEvent
|
||||
{
|
||||
public:
|
||||
// Default ctor, normally shouldn't be used and mostly exists only for
|
||||
@@ -949,30 +949,30 @@ private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent);
|
||||
};
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent );
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent );
|
||||
|
||||
typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
|
||||
|
||||
@@ -1025,7 +1025,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
|
||||
// wxDataViewListStore
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewListStoreLine
|
||||
class WXDLLIMPEXP_CORE wxDataViewListStoreLine
|
||||
{
|
||||
public:
|
||||
wxDataViewListStoreLine( wxUIntPtr data = 0 )
|
||||
@@ -1045,7 +1045,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewListStore: public wxDataViewIndexListModel
|
||||
class WXDLLIMPEXP_CORE wxDataViewListStore: public wxDataViewIndexListModel
|
||||
{
|
||||
public:
|
||||
wxDataViewListStore();
|
||||
@@ -1087,7 +1087,7 @@ public:
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewListCtrl: public wxDataViewCtrl
|
||||
class WXDLLIMPEXP_CORE wxDataViewListCtrl: public wxDataViewCtrl
|
||||
{
|
||||
public:
|
||||
wxDataViewListCtrl();
|
||||
@@ -1192,7 +1192,7 @@ private:
|
||||
// wxDataViewTreeStore
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewTreeStoreNode
|
||||
class WXDLLIMPEXP_CORE wxDataViewTreeStoreNode
|
||||
{
|
||||
public:
|
||||
wxDataViewTreeStoreNode( wxDataViewTreeStoreNode *parent,
|
||||
@@ -1230,7 +1230,7 @@ private:
|
||||
|
||||
typedef wxVector<wxDataViewTreeStoreNode*> wxDataViewTreeStoreNodes;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode
|
||||
class WXDLLIMPEXP_CORE wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode
|
||||
{
|
||||
public:
|
||||
wxDataViewTreeStoreContainerNode( wxDataViewTreeStoreNode *parent,
|
||||
@@ -1268,7 +1268,7 @@ private:
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewTreeStore: public wxDataViewModel
|
||||
class WXDLLIMPEXP_CORE wxDataViewTreeStore: public wxDataViewModel
|
||||
{
|
||||
public:
|
||||
wxDataViewTreeStore();
|
||||
@@ -1337,7 +1337,7 @@ public:
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl,
|
||||
class WXDLLIMPEXP_CORE wxDataViewTreeCtrl: public wxDataViewCtrl,
|
||||
public wxWithImages
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -145,16 +145,10 @@
|
||||
# define WXDLLIMPEXP_INLINE_CORE
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_ADV
|
||||
# define WXDLLIMPEXP_ADV WXEXPORT
|
||||
# define WXDLLIMPEXP_DATA_ADV(type) WXEXPORT type
|
||||
#elif defined(WXUSINGDLL)
|
||||
# define WXDLLIMPEXP_ADV WXIMPORT
|
||||
# define WXDLLIMPEXP_DATA_ADV(type) WXIMPORT type
|
||||
#else /* not making nor using DLL */
|
||||
# define WXDLLIMPEXP_ADV
|
||||
# define WXDLLIMPEXP_DATA_ADV(type) type
|
||||
#endif
|
||||
/* Advanced library doesn't exist any longer, but its macros are preserved for
|
||||
compatibility. Do not use them in the new code. */
|
||||
#define WXDLLIMPEXP_ADV WXDLLIMPEXP_CORE
|
||||
#define WXDLLIMPEXP_DATA_ADV(type) WXDLLIMPEXP_DATA_CORE(type)
|
||||
|
||||
#ifdef WXMAKINGDLL_QA
|
||||
# define WXDLLIMPEXP_QA WXEXPORT
|
||||
@@ -277,7 +271,6 @@
|
||||
#define WXDLLIMPEXP_FWD_BASE
|
||||
#define WXDLLIMPEXP_FWD_NET
|
||||
#define WXDLLIMPEXP_FWD_CORE
|
||||
#define WXDLLIMPEXP_FWD_ADV
|
||||
#define WXDLLIMPEXP_FWD_QA
|
||||
#define WXDLLIMPEXP_FWD_HTML
|
||||
#define WXDLLIMPEXP_FWD_GL
|
||||
@@ -294,7 +287,6 @@
|
||||
#define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE
|
||||
#define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET
|
||||
#define WXDLLIMPEXP_FWD_CORE WXDLLIMPEXP_CORE
|
||||
#define WXDLLIMPEXP_FWD_ADV WXDLLIMPEXP_ADV
|
||||
#define WXDLLIMPEXP_FWD_QA WXDLLIMPEXP_QA
|
||||
#define WXDLLIMPEXP_FWD_HTML WXDLLIMPEXP_HTML
|
||||
#define WXDLLIMPEXP_FWD_GL WXDLLIMPEXP_GL
|
||||
@@ -309,6 +301,9 @@
|
||||
#define WXDLLIMPEXP_FWD_WEBVIEW WXDLLIMPEXP_WEBVIEW
|
||||
#endif
|
||||
|
||||
/* This macro continues to exist for backwards compatibility only. */
|
||||
#define WXDLLIMPEXP_FWD_ADV WXDLLIMPEXP_FWD_CORE
|
||||
|
||||
/* for backwards compatibility, define suffix-less versions too */
|
||||
#define WXDLLEXPORT WXDLLIMPEXP_CORE
|
||||
#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
rest of the renderer classes.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCustomRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCustomRenderer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataViewIconText: helper class used by wxDataViewIconTextRenderer
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewIconText : public wxObject
|
||||
class WXDLLIMPEXP_CORE wxDataViewIconText : public wxObject
|
||||
{
|
||||
public:
|
||||
wxDataViewIconText( const wxString &text = wxEmptyString,
|
||||
@@ -75,13 +75,13 @@ private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxDataViewIconText);
|
||||
};
|
||||
|
||||
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
|
||||
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_CORE)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataViewCheckIconText: value class used by wxDataViewCheckIconTextRenderer
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCheckIconText : public wxDataViewIconText
|
||||
class WXDLLIMPEXP_CORE wxDataViewCheckIconText : public wxDataViewIconText
|
||||
{
|
||||
public:
|
||||
wxDataViewCheckIconText(const wxString& text = wxString(),
|
||||
@@ -101,7 +101,7 @@ private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxDataViewCheckIconText);
|
||||
};
|
||||
|
||||
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewCheckIconText, WXDLLIMPEXP_ADV)
|
||||
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewCheckIconText, WXDLLIMPEXP_CORE)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDataViewRendererBase
|
||||
@@ -123,7 +123,7 @@ enum wxDataViewCellRenderState
|
||||
};
|
||||
|
||||
// helper for fine-tuning rendering of values depending on row's state
|
||||
class WXDLLIMPEXP_ADV wxDataViewValueAdjuster
|
||||
class WXDLLIMPEXP_CORE wxDataViewValueAdjuster
|
||||
{
|
||||
public:
|
||||
virtual ~wxDataViewValueAdjuster() {}
|
||||
@@ -132,7 +132,7 @@ public:
|
||||
virtual wxVariant MakeHighlighted(const wxVariant& value) const { return value; }
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewRendererBase: public wxObject
|
||||
class WXDLLIMPEXP_CORE wxDataViewRendererBase: public wxObject
|
||||
{
|
||||
public:
|
||||
wxDataViewRendererBase( const wxString &varianttype,
|
||||
@@ -300,7 +300,7 @@ private:
|
||||
// wxDataViewCustomRendererBase
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCustomRendererBase
|
||||
class WXDLLIMPEXP_CORE wxDataViewCustomRendererBase
|
||||
: public wxDataViewCustomRendererRealBase
|
||||
{
|
||||
public:
|
||||
@@ -426,7 +426,7 @@ private:
|
||||
// wxDataViewSpinRenderer
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewSpinRenderer: public wxDataViewCustomRenderer
|
||||
class WXDLLIMPEXP_CORE wxDataViewSpinRenderer: public wxDataViewCustomRenderer
|
||||
{
|
||||
public:
|
||||
wxDataViewSpinRenderer( int min, int max,
|
||||
@@ -456,7 +456,7 @@ private:
|
||||
// wxDataViewChoiceRenderer
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer
|
||||
class WXDLLIMPEXP_CORE wxDataViewChoiceRenderer: public wxDataViewCustomRenderer
|
||||
{
|
||||
public:
|
||||
wxDataViewChoiceRenderer( const wxArrayString &choices,
|
||||
@@ -485,7 +485,7 @@ private:
|
||||
// wxDataViewChoiceByIndexRenderer
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer
|
||||
class WXDLLIMPEXP_CORE wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer
|
||||
{
|
||||
public:
|
||||
wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
|
||||
@@ -512,7 +512,7 @@ public:
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_DATEPICKCTRL
|
||||
class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
|
||||
class WXDLLIMPEXP_CORE wxDataViewDateRenderer: public wxDataViewCustomRenderer
|
||||
{
|
||||
public:
|
||||
static wxString GetDefaultType() { return wxS("datetime"); }
|
||||
@@ -545,7 +545,7 @@ typedef wxDataViewTextRenderer wxDataViewDateRenderer;
|
||||
// wxDataViewCheckIconTextRenderer: 3-state checkbox + text + optional icon
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCheckIconTextRenderer
|
||||
class WXDLLIMPEXP_CORE wxDataViewCheckIconTextRenderer
|
||||
: public wxDataViewCustomRenderer
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -26,12 +26,12 @@ class WXDLLIMPEXP_FWD_CORE wxListEvent;
|
||||
#define wxEL_NO_REORDER 0x0800
|
||||
#define wxEL_DEFAULT_STYLE (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxEditableListBoxNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxEditableListBoxNameStr[];
|
||||
|
||||
// This class provides a composite control that lets the
|
||||
// user easily enter list of strings
|
||||
|
||||
class WXDLLIMPEXP_ADV wxEditableListBox : public wxPanel
|
||||
class WXDLLIMPEXP_CORE wxEditableListBox : public wxPanel
|
||||
{
|
||||
public:
|
||||
wxEditableListBox() { Init(); }
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include "wx/dialog.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxAboutDialogInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSizer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
|
||||
|
||||
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
|
||||
// wxGenericAboutDialog: generic "About" dialog implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGenericAboutDialog : public wxDialog
|
||||
class WXDLLIMPEXP_CORE wxGenericAboutDialog : public wxDialog
|
||||
{
|
||||
public:
|
||||
// constructors and Create() method
|
||||
@@ -94,7 +94,7 @@ private:
|
||||
|
||||
// unlike wxAboutBox which can show either the native or generic about dialog,
|
||||
// this function always shows the generic one
|
||||
WXDLLIMPEXP_ADV void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent = NULL);
|
||||
WXDLLIMPEXP_CORE void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent = NULL);
|
||||
|
||||
#endif // wxUSE_ABOUTDLG
|
||||
|
||||
|
||||
@@ -21,17 +21,17 @@
|
||||
#include "wx/access.h"
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewMainWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewHeaderWindow;
|
||||
#if wxUSE_ACCESSIBILITY
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlAccessible;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlAccessible;
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
|
||||
// ---------------------------------------------------------
|
||||
// wxDataViewColumn
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewColumn : public wxDataViewColumnBase
|
||||
class WXDLLIMPEXP_CORE wxDataViewColumn : public wxDataViewColumnBase
|
||||
{
|
||||
public:
|
||||
wxDataViewColumn(const wxString& title,
|
||||
@@ -168,9 +168,9 @@ private:
|
||||
// ---------------------------------------------------------
|
||||
|
||||
WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
|
||||
class WXDLLIMPEXP_ADV);
|
||||
class WXDLLIMPEXP_CORE);
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCtrl : public wxDataViewCtrlBase,
|
||||
class WXDLLIMPEXP_CORE wxDataViewCtrl : public wxDataViewCtrlBase,
|
||||
public wxScrollHelper
|
||||
{
|
||||
friend class wxDataViewMainWindow;
|
||||
@@ -405,7 +405,7 @@ private:
|
||||
// wxDataViewCtrlAccessible
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCtrlAccessible: public wxWindowAccessible
|
||||
class WXDLLIMPEXP_CORE wxDataViewCtrlAccessible: public wxWindowAccessible
|
||||
{
|
||||
public:
|
||||
wxDataViewCtrlAccessible(wxDataViewCtrl* win);
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
|
||||
class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCalendarCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCalendarComboPopup;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
|
||||
class WXDLLIMPEXP_CORE wxDatePickerCtrlGeneric
|
||||
: public wxCompositeWindow< wxNavigationEnabled<wxDatePickerCtrlBase> >
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxGridNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxGridNameStr[];
|
||||
|
||||
// Default parameters for wxGrid
|
||||
//
|
||||
@@ -82,15 +82,15 @@ enum wxGridRenderStyle
|
||||
// forward declarations
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxGrid;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridCellAttr;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridCellAttrProviderData;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridColLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridCornerLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridRowLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridWindow;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridTypeRegistry;
|
||||
class WXDLLIMPEXP_FWD_ADV wxGridSelection;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGrid;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridCellAttr;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridCellAttrProviderData;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridColLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridCornerLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridRowLabelWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridTypeRegistry;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGridSelection;
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxHeaderCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
|
||||
@@ -123,7 +123,7 @@ class wxGridDirectionOperations;
|
||||
// class is not documented and is not public at all
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer, public wxRefCounter
|
||||
class WXDLLIMPEXP_CORE wxGridCellWorker : public wxClientDataContainer, public wxRefCounter
|
||||
{
|
||||
public:
|
||||
wxGridCellWorker() { }
|
||||
@@ -151,7 +151,7 @@ private:
|
||||
// predefined derived classes or derive your own class from it.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridCellRenderer : public wxGridCellWorker
|
||||
class WXDLLIMPEXP_CORE wxGridCellRenderer : public wxGridCellWorker
|
||||
{
|
||||
public:
|
||||
// draw the given cell on the provided DC inside the given rectangle
|
||||
@@ -210,7 +210,7 @@ public:
|
||||
// even for the entire grid.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker
|
||||
class WXDLLIMPEXP_CORE wxGridCellEditor : public wxGridCellWorker
|
||||
{
|
||||
public:
|
||||
wxGridCellEditor();
|
||||
@@ -327,7 +327,7 @@ protected:
|
||||
|
||||
// Base class for corner window renderer: it is the simplest of all renderers
|
||||
// and only has a single function
|
||||
class WXDLLIMPEXP_ADV wxGridCornerHeaderRenderer
|
||||
class WXDLLIMPEXP_CORE wxGridCornerHeaderRenderer
|
||||
{
|
||||
public:
|
||||
// Draw the border around the corner window.
|
||||
@@ -343,7 +343,7 @@ public:
|
||||
|
||||
|
||||
// Base class for the row/column header cells renderers
|
||||
class WXDLLIMPEXP_ADV wxGridHeaderLabelsRenderer
|
||||
class WXDLLIMPEXP_CORE wxGridHeaderLabelsRenderer
|
||||
: public wxGridCornerHeaderRenderer
|
||||
{
|
||||
public:
|
||||
@@ -361,19 +361,19 @@ public:
|
||||
// those already in wxGridHeaderLabelsRenderer but still define separate classes
|
||||
// for them for future extensions and also for better type safety (i.e. to
|
||||
// avoid inadvertently using a column header renderer for the row headers)
|
||||
class WXDLLIMPEXP_ADV wxGridRowHeaderRenderer
|
||||
class WXDLLIMPEXP_CORE wxGridRowHeaderRenderer
|
||||
: public wxGridHeaderLabelsRenderer
|
||||
{
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridColumnHeaderRenderer
|
||||
class WXDLLIMPEXP_CORE wxGridColumnHeaderRenderer
|
||||
: public wxGridHeaderLabelsRenderer
|
||||
{
|
||||
};
|
||||
|
||||
// Also define the default renderers which are used by wxGridCellAttrProvider
|
||||
// by default
|
||||
class WXDLLIMPEXP_ADV wxGridRowHeaderRendererDefault
|
||||
class WXDLLIMPEXP_CORE wxGridRowHeaderRendererDefault
|
||||
: public wxGridRowHeaderRenderer
|
||||
{
|
||||
public:
|
||||
@@ -383,7 +383,7 @@ public:
|
||||
};
|
||||
|
||||
// Column header cells renderers
|
||||
class WXDLLIMPEXP_ADV wxGridColumnHeaderRendererDefault
|
||||
class WXDLLIMPEXP_CORE wxGridColumnHeaderRendererDefault
|
||||
: public wxGridColumnHeaderRenderer
|
||||
{
|
||||
public:
|
||||
@@ -393,7 +393,7 @@ public:
|
||||
};
|
||||
|
||||
// Header corner renderer
|
||||
class WXDLLIMPEXP_ADV wxGridCornerHeaderRendererDefault
|
||||
class WXDLLIMPEXP_CORE wxGridCornerHeaderRendererDefault
|
||||
: public wxGridCornerHeaderRenderer
|
||||
{
|
||||
public:
|
||||
@@ -409,7 +409,7 @@ public:
|
||||
// class may be returned by wxGridTable::GetAttr().
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridCellAttr : public wxClientDataContainer, public wxRefCounter
|
||||
class WXDLLIMPEXP_CORE wxGridCellAttr : public wxClientDataContainer, public wxRefCounter
|
||||
{
|
||||
public:
|
||||
enum wxAttrKind
|
||||
@@ -574,7 +574,7 @@ private:
|
||||
// the default implementation is reasonably efficient for the generic case,
|
||||
// but you might still wish to implement your own for some specific situations
|
||||
// if you have performance problems with the stock one
|
||||
class WXDLLIMPEXP_ADV wxGridCellAttrProvider : public wxClientDataContainer
|
||||
class WXDLLIMPEXP_CORE wxGridCellAttrProvider : public wxClientDataContainer
|
||||
{
|
||||
public:
|
||||
wxGridCellAttrProvider();
|
||||
@@ -615,7 +615,7 @@ private:
|
||||
// wxGridCellCoords: location of a cell in the grid
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridCellCoords
|
||||
class WXDLLIMPEXP_CORE wxGridCellCoords
|
||||
{
|
||||
public:
|
||||
wxGridCellCoords() { m_row = m_col = -1; }
|
||||
@@ -662,20 +662,20 @@ private:
|
||||
|
||||
// For comparisons...
|
||||
//
|
||||
extern WXDLLIMPEXP_ADV wxGridCellCoords wxGridNoCellCoords;
|
||||
extern WXDLLIMPEXP_ADV wxRect wxGridNoCellRect;
|
||||
extern WXDLLIMPEXP_CORE wxGridCellCoords wxGridNoCellCoords;
|
||||
extern WXDLLIMPEXP_CORE wxRect wxGridNoCellRect;
|
||||
|
||||
// An array of cell coords...
|
||||
//
|
||||
WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
|
||||
class WXDLLIMPEXP_ADV);
|
||||
class WXDLLIMPEXP_CORE);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Grid table classes
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the abstract base class
|
||||
class WXDLLIMPEXP_ADV wxGridTableBase : public wxObject,
|
||||
class WXDLLIMPEXP_CORE wxGridTableBase : public wxObject,
|
||||
public wxClientDataContainer
|
||||
{
|
||||
public:
|
||||
@@ -802,7 +802,7 @@ enum wxGridTableRequest
|
||||
wxGRIDTABLE_NOTIFY_COLS_DELETED
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridTableMessage
|
||||
class WXDLLIMPEXP_CORE wxGridTableMessage
|
||||
{
|
||||
public:
|
||||
wxGridTableMessage();
|
||||
@@ -835,7 +835,7 @@ private:
|
||||
//
|
||||
|
||||
WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray,
|
||||
class WXDLLIMPEXP_ADV);
|
||||
class WXDLLIMPEXP_CORE);
|
||||
|
||||
|
||||
|
||||
@@ -845,7 +845,7 @@ WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray,
|
||||
// that are stored in memory
|
||||
//
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridStringTable : public wxGridTableBase
|
||||
class WXDLLIMPEXP_CORE wxGridStringTable : public wxGridTableBase
|
||||
{
|
||||
public:
|
||||
wxGridStringTable();
|
||||
@@ -907,9 +907,9 @@ private:
|
||||
|
||||
// hash map to store positions as the keys and sizes as the values
|
||||
WX_DECLARE_HASH_MAP_WITH_DECL( unsigned, int, wxIntegerHash, wxIntegerEqual,
|
||||
wxUnsignedToIntHashMap, class WXDLLIMPEXP_ADV );
|
||||
wxUnsignedToIntHashMap, class WXDLLIMPEXP_CORE );
|
||||
|
||||
struct WXDLLIMPEXP_ADV wxGridSizesInfo
|
||||
struct WXDLLIMPEXP_CORE wxGridSizesInfo
|
||||
{
|
||||
// default ctor, initialize m_sizeDefault and m_customSizes later
|
||||
wxGridSizesInfo() { }
|
||||
@@ -934,7 +934,7 @@ struct WXDLLIMPEXP_ADV wxGridSizesInfo
|
||||
// wxGrid
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow
|
||||
class WXDLLIMPEXP_CORE wxGrid : public wxScrolledWindow
|
||||
{
|
||||
public:
|
||||
// possible selection modes
|
||||
@@ -2167,7 +2167,7 @@ protected:
|
||||
{ UpdateBlockBeingSelected(topLeft.GetRow(), topLeft.GetCol(),
|
||||
bottomRight.GetRow(), bottomRight.GetCol()); }
|
||||
|
||||
friend class WXDLLIMPEXP_FWD_ADV wxGridSelection;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxGridSelection;
|
||||
friend class wxGridRowOperations;
|
||||
friend class wxGridColumnOperations;
|
||||
|
||||
@@ -2367,7 +2367,7 @@ private:
|
||||
// wxGridUpdateLocker prevents updates to a grid during its lifetime
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridUpdateLocker
|
||||
class WXDLLIMPEXP_CORE wxGridUpdateLocker
|
||||
{
|
||||
public:
|
||||
// if the pointer is NULL, Create() can be called later
|
||||
@@ -2408,7 +2408,7 @@ private:
|
||||
// Grid event class and event types
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridEvent : public wxNotifyEvent,
|
||||
class WXDLLIMPEXP_CORE wxGridEvent : public wxNotifyEvent,
|
||||
public wxKeyboardState
|
||||
{
|
||||
public:
|
||||
@@ -2471,7 +2471,7 @@ private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEvent);
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent,
|
||||
class WXDLLIMPEXP_CORE wxGridSizeEvent : public wxNotifyEvent,
|
||||
public wxKeyboardState
|
||||
{
|
||||
public:
|
||||
@@ -2528,7 +2528,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridRangeSelectEvent : public wxNotifyEvent,
|
||||
class WXDLLIMPEXP_CORE wxGridRangeSelectEvent : public wxNotifyEvent,
|
||||
public wxKeyboardState
|
||||
{
|
||||
public:
|
||||
@@ -2593,7 +2593,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridEditorCreatedEvent : public wxCommandEvent
|
||||
class WXDLLIMPEXP_CORE wxGridEditorCreatedEvent : public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxGridEditorCreatedEvent()
|
||||
@@ -2625,28 +2625,28 @@ private:
|
||||
};
|
||||
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGING, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGED, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_MOVE, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SORT, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_TABBING, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_RIGHT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_ROW_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_COL_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_CHANGING, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_CHANGED, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_SELECT_CELL, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_EDITOR_SHOWN, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_COL_MOVE, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_COL_SORT, wxGridEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_GRID_TABBING, wxGridEvent );
|
||||
|
||||
typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
|
||||
typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&);
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#include "wx/grid.h"
|
||||
|
||||
class WXDLLIMPEXP_ADV wxGridSelection
|
||||
class WXDLLIMPEXP_CORE wxGridSelection
|
||||
{
|
||||
public:
|
||||
wxGridSelection(wxGrid *grid,
|
||||
@@ -106,7 +106,7 @@ private:
|
||||
wxGrid *m_grid;
|
||||
wxGrid::wxGridSelectionModes m_selectionMode;
|
||||
|
||||
friend class WXDLLIMPEXP_FWD_ADV wxGrid;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxGrid;
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(wxGridSelection);
|
||||
};
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#include "wx/event.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxQueryLayoutInfoEvent;
|
||||
class WXDLLIMPEXP_FWD_ADV wxCalculateLayoutEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxQueryLayoutInfoEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCalculateLayoutEvent;
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent );
|
||||
|
||||
enum wxLayoutOrientation
|
||||
{
|
||||
@@ -57,7 +57,7 @@ enum wxLayoutAlignment
|
||||
* orientation and size.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxQueryLayoutInfoEvent: public wxEvent
|
||||
class WXDLLIMPEXP_CORE wxQueryLayoutInfoEvent: public wxEvent
|
||||
{
|
||||
public:
|
||||
wxQueryLayoutInfoEvent(wxWindowID id = 0)
|
||||
@@ -112,7 +112,7 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
|
||||
* This event is used to take a bite out of the available client area.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent
|
||||
class WXDLLIMPEXP_CORE wxCalculateLayoutEvent: public wxEvent
|
||||
{
|
||||
public:
|
||||
wxCalculateLayoutEvent(wxWindowID id = 0)
|
||||
@@ -152,7 +152,7 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
|
||||
// This is window that can remember alignment/orientation, does its own layout,
|
||||
// and can provide sashes too. Useful for implementing docked windows with sashes in
|
||||
// an IDE-style interface.
|
||||
class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow
|
||||
class WXDLLIMPEXP_CORE wxSashLayoutWindow: public wxSashWindow
|
||||
{
|
||||
public:
|
||||
wxSashLayoutWindow()
|
||||
@@ -205,7 +205,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
||||
|
||||
// This class implements the layout algorithm
|
||||
class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject
|
||||
class WXDLLIMPEXP_CORE wxLayoutAlgorithm: public wxObject
|
||||
{
|
||||
public:
|
||||
wxLayoutAlgorithm() {}
|
||||
|
||||
@@ -35,7 +35,7 @@ enum wxSashEdgePosition {
|
||||
* wxSashEdge represents one of the four edges of a window.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashEdge
|
||||
class WXDLLIMPEXP_CORE wxSashEdge
|
||||
{
|
||||
public:
|
||||
wxSashEdge()
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
* of wxSashWindow.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow
|
||||
class WXDLLIMPEXP_CORE wxSashWindow: public wxWindow
|
||||
{
|
||||
public:
|
||||
// Default constructor
|
||||
@@ -186,9 +186,9 @@ private:
|
||||
wxDECLARE_NO_COPY_CLASS(wxSashWindow);
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxSashEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSashEvent;
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_SASH_DRAGGED, wxSashEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SASH_DRAGGED, wxSashEvent );
|
||||
|
||||
enum wxSashDragStatus
|
||||
{
|
||||
@@ -196,7 +196,7 @@ enum wxSashDragStatus
|
||||
wxSASH_STATUS_OUT_OF_RANGE
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent
|
||||
class WXDLLIMPEXP_CORE wxSashEvent: public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE)
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
#define wxSPLASH_TIMEOUT 0x04
|
||||
#define wxSPLASH_NO_TIMEOUT 0x00
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSplashScreenWindow;
|
||||
|
||||
/*
|
||||
* wxSplashScreen
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame,
|
||||
class WXDLLIMPEXP_CORE wxSplashScreen: public wxFrame,
|
||||
public wxEventFilter
|
||||
{
|
||||
public:
|
||||
@@ -74,7 +74,7 @@ protected:
|
||||
* wxSplashScreenWindow
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow
|
||||
class WXDLLIMPEXP_CORE wxSplashScreenWindow: public wxWindow
|
||||
{
|
||||
public:
|
||||
wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
|
||||
class WXDLLIMPEXP_FWD_ADV wxWizardEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWizardEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
|
||||
class WXDLLIMPEXP_FWD_ADV wxWizardSizer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWizardSizer;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase
|
||||
class WXDLLIMPEXP_CORE wxWizard : public wxWizardBase
|
||||
{
|
||||
public:
|
||||
// ctor
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "wx/list.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlInternal;
|
||||
|
||||
struct _GtkTreePath;
|
||||
|
||||
@@ -19,7 +19,7 @@ struct _GtkTreePath;
|
||||
// wxDataViewColumn
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
|
||||
class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
|
||||
{
|
||||
public:
|
||||
wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
|
||||
@@ -94,13 +94,13 @@ private:
|
||||
};
|
||||
|
||||
WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
|
||||
class WXDLLIMPEXP_ADV);
|
||||
class WXDLLIMPEXP_CORE);
|
||||
|
||||
// ---------------------------------------------------------
|
||||
// wxDataViewCtrl
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
|
||||
class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
|
||||
{
|
||||
public:
|
||||
wxDataViewCtrl()
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#define wxHL_ALIGN_CENTRE 0x0008
|
||||
#define wxHL_DEFAULT_STYLE (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE)
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxHyperlinkCtrlNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxHyperlinkCtrlNameStr[];
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -44,7 +44,7 @@ extern WXDLLIMPEXP_DATA_ADV(const char) wxHyperlinkCtrlNameStr[];
|
||||
// just like a wxCommandEvent.
|
||||
//
|
||||
// Use the EVT_HYPERLINK() to catch link events.
|
||||
class WXDLLIMPEXP_ADV wxHyperlinkCtrlBase : public wxControl
|
||||
class WXDLLIMPEXP_CORE wxHyperlinkCtrlBase : public wxControl
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -85,15 +85,15 @@ public:
|
||||
// wxHyperlinkEvent
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxHyperlinkEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxHyperlinkEvent;
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_HYPERLINK, wxHyperlinkEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HYPERLINK, wxHyperlinkEvent );
|
||||
|
||||
//
|
||||
// An event fired when the user clicks on the label in a hyperlink control.
|
||||
// See HyperlinkControl for details.
|
||||
//
|
||||
class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent
|
||||
class WXDLLIMPEXP_CORE wxHyperlinkEvent : public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxHyperlinkEvent() {}
|
||||
@@ -142,7 +142,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
|
||||
#else
|
||||
#include "wx/generic/hyperlink.h"
|
||||
|
||||
class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl
|
||||
class WXDLLIMPEXP_CORE wxHyperlinkCtrl : public wxGenericHyperlinkCtrl
|
||||
{
|
||||
public:
|
||||
wxHyperlinkCtrl() { }
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
#include "wx/icon.h"
|
||||
|
||||
// private helper class:
|
||||
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTaskBarIconWindow;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
|
||||
class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
|
||||
{
|
||||
public:
|
||||
wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
// notice that this class is not a window and so doesn't derive from wxWindow
|
||||
|
||||
class WXDLLIMPEXP_ADV wxNotificationMessageBase : public wxEvtHandler
|
||||
class WXDLLIMPEXP_CORE wxNotificationMessageBase : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
// ctors and initializers
|
||||
@@ -117,9 +117,9 @@ private:
|
||||
wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
|
||||
};
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_CLICK, wxCommandEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_DISMISSED, wxCommandEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_ACTION, wxCommandEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTIFICATION_MESSAGE_CLICK, wxCommandEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTIFICATION_MESSAGE_DISMISSED, wxCommandEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTIFICATION_MESSAGE_ACTION, wxCommandEvent );
|
||||
|
||||
#if (defined(__WXGTK__) && wxUSE_LIBNOTIFY) || \
|
||||
(defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS) || \
|
||||
@@ -134,14 +134,14 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_NOTIFICATION_MESSAGE_ACTION, wx
|
||||
#ifdef wxHAS_NATIVE_NOTIFICATION_MESSAGE
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
class WXDLLIMPEXP_FWD_ADV wxTaskBarIcon;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTaskBarIcon;
|
||||
#endif // defined(__WXMSW__)
|
||||
|
||||
#else
|
||||
#include "wx/generic/notifmsg.h"
|
||||
#endif // wxHAS_NATIVE_NOTIFICATION_MESSAGE
|
||||
|
||||
class WXDLLIMPEXP_ADV wxNotificationMessage : public
|
||||
class WXDLLIMPEXP_CORE wxNotificationMessage : public
|
||||
#ifdef wxHAS_NATIVE_NOTIFICATION_MESSAGE
|
||||
wxNotificationMessageBase
|
||||
#else
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxSoundTimer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSoundTimer;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSoundData
|
||||
class WXDLLIMPEXP_CORE wxSoundData
|
||||
{
|
||||
public :
|
||||
wxSoundData();
|
||||
@@ -39,7 +39,7 @@ protected:
|
||||
bool m_markedForDeletion;
|
||||
} ;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
|
||||
class WXDLLIMPEXP_CORE wxSound : public wxSoundBase
|
||||
{
|
||||
public:
|
||||
wxSound();
|
||||
|
||||
@@ -796,7 +796,7 @@ wxValidator* PROPNAME::DoGetValidator () const \
|
||||
|
||||
#if wxUSE_EDITABLELISTBOX
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxEditableListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxEditableListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxListEvent;
|
||||
|
||||
#define wxAEDIALOG_STYLE \
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#include "wx/event.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTaskBarIconEvent;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@@ -38,7 +38,7 @@ enum wxTaskBarIconType
|
||||
// wxTaskBarIconBase: define wxTaskBarIcon interface
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTaskBarIconBase : public wxEvtHandler
|
||||
class WXDLLIMPEXP_CORE wxTaskBarIconBase : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
wxTaskBarIconBase() { }
|
||||
@@ -91,7 +91,7 @@ private:
|
||||
// wxTaskBarIcon events
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTaskBarIconEvent : public wxEvent
|
||||
class WXDLLIMPEXP_CORE wxTaskBarIconEvent : public wxEvent
|
||||
{
|
||||
public:
|
||||
wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)
|
||||
@@ -108,15 +108,15 @@ private:
|
||||
|
||||
typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent );
|
||||
|
||||
#define wxTaskBarIconEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxTaskBarIconEventFunction, func)
|
||||
|
||||
@@ -22,10 +22,10 @@
|
||||
#include "wx/window.h"
|
||||
#include "wx/withimages.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataViewEvent;
|
||||
|
||||
extern WXDLLIMPEXP_DATA_ADV(const char) wxTreeListCtrlNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeListCtrlNameStr[];
|
||||
|
||||
class wxTreeListCtrl;
|
||||
class wxTreeListModel;
|
||||
@@ -75,8 +75,8 @@ public:
|
||||
typedef wxVector<wxTreeListItem> wxTreeListItems;
|
||||
|
||||
// Some special "items" that can be used with InsertItem():
|
||||
extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_FIRST;
|
||||
extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST;
|
||||
extern WXDLLIMPEXP_DATA_CORE(const wxTreeListItem) wxTLI_FIRST;
|
||||
extern WXDLLIMPEXP_DATA_CORE(const wxTreeListItem) wxTLI_LAST;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxTreeListItemComparator: defines order of wxTreeListCtrl items.
|
||||
@@ -117,7 +117,7 @@ private:
|
||||
// with wxDataViewCtrl directly but doing this makes your unportable to possible
|
||||
// future non-wxDataViewCtrl-based implementations of this class.
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTreeListCtrl
|
||||
class WXDLLIMPEXP_CORE wxTreeListCtrl
|
||||
: public wxCompositeWindow< wxNavigationEnabled<wxWindow> >,
|
||||
public wxWithImages
|
||||
{
|
||||
@@ -454,7 +454,7 @@ private:
|
||||
// wxTreeListEvent: event generated by wxTreeListCtrl.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTreeListEvent : public wxNotifyEvent
|
||||
class WXDLLIMPEXP_CORE wxTreeListEvent : public wxNotifyEvent
|
||||
{
|
||||
public:
|
||||
// Default ctor is provided for wxRTTI needs only but should never be used.
|
||||
@@ -529,7 +529,7 @@ typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&);
|
||||
wx__DECLARE_EVT1(wxEVT_TREELIST_##name, id, wxTreeListEventHandler(fn))
|
||||
|
||||
#define wxDECLARE_TREELIST_EVENT(name) \
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, \
|
||||
wxEVT_TREELIST_##name, \
|
||||
wxTreeListEvent)
|
||||
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
// wxSound: simple audio playback class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxSoundBackend;
|
||||
class WXDLLIMPEXP_FWD_ADV wxSound;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSoundBackend;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSound;
|
||||
class WXDLLIMPEXP_FWD_BASE wxDynamicLibrary;
|
||||
|
||||
/// Sound data, as loaded from .wav file:
|
||||
class WXDLLIMPEXP_ADV wxSoundData
|
||||
class WXDLLIMPEXP_CORE wxSoundData
|
||||
{
|
||||
public:
|
||||
wxSoundData() : m_refCnt(1) {}
|
||||
@@ -54,7 +54,7 @@ private:
|
||||
|
||||
|
||||
/// Simple sound class:
|
||||
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
|
||||
class WXDLLIMPEXP_CORE wxSound : public wxSoundBase
|
||||
{
|
||||
public:
|
||||
wxSound();
|
||||
@@ -116,7 +116,7 @@ struct wxSoundPlaybackStatus
|
||||
};
|
||||
|
||||
// Audio backend interface
|
||||
class WXDLLIMPEXP_ADV wxSoundBackend
|
||||
class WXDLLIMPEXP_CORE wxSoundBackend
|
||||
{
|
||||
public:
|
||||
virtual ~wxSoundBackend() {}
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#ifndef _WX_UNIX_TASKBAR_H_
|
||||
#define _WX_UNIX_TASKBAR_H_
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTaskBarIconArea;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
|
||||
class WXDLLIMPEXP_CORE wxTaskBarIcon: public wxTaskBarIconBase
|
||||
{
|
||||
public:
|
||||
wxTaskBarIcon();
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#define wxWIZARD_TILE 0x40
|
||||
|
||||
// forward declarations
|
||||
class WXDLLIMPEXP_FWD_ADV wxWizard;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWizard;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxWizardPage is one of the wizards screen: it must know what are the
|
||||
@@ -52,7 +52,7 @@ class WXDLLIMPEXP_FWD_ADV wxWizard;
|
||||
// used as such (i.e. controls may be placed directly on it &c).
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxWizardPage : public wxPanel
|
||||
class WXDLLIMPEXP_CORE wxWizardPage : public wxPanel
|
||||
{
|
||||
public:
|
||||
wxWizardPage() { Init(); }
|
||||
@@ -118,7 +118,7 @@ private:
|
||||
// this, you must derive from wxWizardPage directly.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxWizardPageSimple : public wxWizardPage
|
||||
class WXDLLIMPEXP_CORE wxWizardPageSimple : public wxWizardPage
|
||||
{
|
||||
public:
|
||||
wxWizardPageSimple() { Init(); }
|
||||
@@ -187,7 +187,7 @@ private:
|
||||
// wxWizard
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxWizardBase : public wxDialog
|
||||
class WXDLLIMPEXP_CORE wxWizardBase : public wxDialog
|
||||
{
|
||||
public:
|
||||
/*
|
||||
@@ -263,7 +263,7 @@ private:
|
||||
// window hierarchy as usual
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent
|
||||
class WXDLLIMPEXP_CORE wxWizardEvent : public wxNotifyEvent
|
||||
{
|
||||
public:
|
||||
wxWizardEvent(wxEventType type = wxEVT_NULL,
|
||||
@@ -292,13 +292,13 @@ private:
|
||||
// macros for handling wxWizardEvents
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_CANCEL, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_HELP, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_FINISHED, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_CANCEL, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_HELP, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_FINISHED, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent );
|
||||
|
||||
typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxBitmapComboBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmapComboBox;
|
||||
|
||||
class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#if wxUSE_XRC
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxPropertySheetDialog;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPropertySheetDialog;
|
||||
|
||||
class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxXmlResourceHandler
|
||||
{
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#if wxUSE_XRC && wxUSE_WIZARDDLG
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxWizard;
|
||||
class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWizard;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWizardPageSimple;
|
||||
|
||||
class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "wx/imaglist.h"
|
||||
#include "wx/window.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxAnimation;
|
||||
class WXDLLIMPEXP_FWD_CORE wxAnimation;
|
||||
|
||||
class WXDLLIMPEXP_FWD_XML wxXmlNode;
|
||||
class WXDLLIMPEXP_FWD_XML wxXmlResource;
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
WXUNUSED+
|
||||
WXDLLEXPORT
|
||||
WXDLLIMPEXP_ADV
|
||||
WXDLLIMPEXP_DATA_ADV+
|
||||
WXDLLIMPEXP_FWD_ADV
|
||||
WXDLLIMPEXP_AUI
|
||||
WXDLLIMPEXP_DATA_AUI+
|
||||
WXDLLIMPEXP_FWD_AUI
|
||||
|
||||
@@ -31,7 +31,6 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
@@ -56,7 +55,6 @@ ANITEST_OBJECTS = \
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -98,9 +96,6 @@ COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__anitest_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_COCOA@____anitest_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__anitest_app_Contents_PkgInfo___depname)
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -151,7 +146,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(__anitest___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
<exe id="anitest" template="wx_sample" template_append="wx_append">
|
||||
<sources>anitest.cpp</sources>
|
||||
<headers>anitest.h</headers>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>../sample.rc</win32-res>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -108,7 +108,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -175,7 +175,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -237,7 +237,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -276,7 +276,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -370,7 +370,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -469,7 +469,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -563,7 +563,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -662,7 +662,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -756,7 +756,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -173,7 +173,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -268,7 +268,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -359,7 +359,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -454,7 +454,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -545,7 +545,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -640,7 +640,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\anitest.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -731,7 +731,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\anitest.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -164,10 +164,6 @@ __DLLFLAG_p = -DWXUSINGDLL
|
||||
__DLLFLAG_p_1 = -dWXUSINGDLL
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_CORE_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
||||
!endif
|
||||
@@ -232,7 +228,7 @@ clean:
|
||||
|
||||
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
|
||||
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
|
||||
c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
|
||||
c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
|
||||
|
|
||||
|
||||
catalog:
|
||||
|
||||
@@ -149,10 +149,6 @@ ifeq ($(SHARED),1)
|
||||
__DLLFLAG_p_1 = --define WXUSINGDLL
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_ADV_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_CORE_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
|
||||
endif
|
||||
@@ -222,7 +218,7 @@ clean:
|
||||
-if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
|
||||
|
||||
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
|
||||
catalog:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
|
||||
@@ -88,7 +88,7 @@ test_for_selected_wxbuild:
|
||||
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
|
||||
|
||||
anitest: $(ANITEST_OBJECTS)
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`
|
||||
$(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
|
||||
|
||||
anitest_anitest.o: ./anitest.cpp
|
||||
$(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -302,10 +302,6 @@ __DLLFLAG_p = /DWXUSINGDLL
|
||||
__DLLFLAG_p_1 = /d WXUSINGDLL
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_CORE_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
||||
!endif
|
||||
@@ -355,7 +351,7 @@ clean:
|
||||
|
||||
$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
|
||||
$(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
$(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
<<
|
||||
|
||||
catalog:
|
||||
|
||||
@@ -32,7 +32,6 @@ EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_HTML = @EXTRALIBS_HTML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
@@ -57,7 +56,6 @@ AUIDEMO_OBJECTS = \
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -106,9 +104,6 @@ COND_MONOLITHIC_0___WXLIB_AUI_p = \
|
||||
COND_MONOLITHIC_0___WXLIB_HTML_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -161,7 +156,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(__auidemo___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
</sources>
|
||||
<wx-lib>aui</wx-lib>
|
||||
<wx-lib>html</wx-lib>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -108,7 +108,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -175,7 +175,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
@@ -237,7 +237,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -276,7 +276,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -370,7 +370,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -469,7 +469,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -563,7 +563,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -662,7 +662,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -756,7 +756,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -173,7 +173,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -268,7 +268,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -359,7 +359,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -454,7 +454,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswud_x64\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -545,7 +545,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswu_x64\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -640,7 +640,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswuddll_x64\auidemo.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
@@ -731,7 +731,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=""
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
|
||||
OutputFile="vc_mswudll_x64\auidemo.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
||||
@@ -172,10 +172,6 @@ __WXLIB_HTML_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_CORE_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
||||
!endif
|
||||
@@ -244,7 +240,7 @@ clean:
|
||||
|
||||
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
|
||||
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
|
||||
c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
|
||||
c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
|
||||
|
|
||||
|
||||
$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
|
||||
|
||||
@@ -157,10 +157,6 @@ __WXLIB_HTML_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_ADV_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_CORE_p = \
|
||||
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
|
||||
endif
|
||||
@@ -234,7 +230,7 @@ clean:
|
||||
-if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
|
||||
|
||||
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
|
||||
|
||||
$(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
|
||||
@@ -88,7 +88,7 @@ test_for_selected_wxbuild:
|
||||
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
|
||||
|
||||
auidemo: $(AUIDEMO_OBJECTS)
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,adv,core,xml,base`
|
||||
$(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,core,xml,base`
|
||||
|
||||
auidemo_auidemo.o: ./auidemo.cpp
|
||||
$(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@@ -310,10 +310,6 @@ __WXLIB_HTML_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_ADV_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_CORE_p = \
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
||||
!endif
|
||||
@@ -367,7 +363,7 @@ clean:
|
||||
|
||||
$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
|
||||
$(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
$(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
|
||||
<<
|
||||
|
||||
$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
|
||||
|
||||
@@ -31,7 +31,6 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
@@ -56,7 +55,6 @@ CALENDAR_OBJECTS = \
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -99,9 +97,6 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__calendar_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_COCOA@____calendar_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__calendar_app_Contents_PkgInfo___depname)
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -151,7 +146,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
|
||||
$(CXX) -o $@ $(CALENDAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(CXX) -o $@ $(CALENDAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
$(__calendar___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
<exe id="calendar" template="wx_sample" template_append="wx_append">
|
||||
<sources>calendar.cpp</sources>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
</exe>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user