Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-02 13:52:31 +00:00
parent 57bfe3be85
commit 131f235d04
10 changed files with 460 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

537
Makefile.in
View File

File diff suppressed because it is too large Load Diff

30
aclocal.m4 vendored
View File

@@ -1147,12 +1147,15 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_BAKEFILE_SUFFIXES, AC_DEFUN(AC_BAKEFILE_SUFFIXES,
[ [
SO_SUFFIX="so" SO_SUFFIX="so"
SO_SUFFIX_MODULE="so"
EXEEXT="" EXEEXT=""
DLLPREFIX=lib DLLPREFIX=lib
DLLPREFIX_MODULE=
case "${host}" in case "${host}" in
*-hp-hpux* ) *-hp-hpux* )
SO_SUFFIX="sl" SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;; ;;
*-*-aix* ) *-*-aix* )
dnl quoting from dnl quoting from
@@ -1161,9 +1164,11 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
dnl .a extension. This will explain why you can't link with an dnl .a extension. This will explain why you can't link with an
dnl .so and why it works with the name changed to .a. dnl .so and why it works with the name changed to .a.
SO_SUFFIX="a" SO_SUFFIX="a"
SO_SUFFIX_MODULE="a"
;; ;;
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll"
EXEEXT=".exe" EXEEXT=".exe"
DLLPREFIX="" DLLPREFIX=""
;; ;;
@@ -1173,12 +1178,15 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
;; ;;
powerpc-*-darwin* ) powerpc-*-darwin* )
SO_SUFFIX="dylib" SO_SUFFIX="dylib"
SO_SUFFIX_MODULE="bundle"
;; ;;
esac esac
AC_SUBST(SO_SUFFIX) AC_SUBST(SO_SUFFIX)
AC_SUBST(SO_SUFFIX_MODULE)
AC_SUBST(EXEEXT) AC_SUBST(EXEEXT)
AC_SUBST(DLLPREFIX) AC_SUBST(DLLPREFIX)
AC_SUBST(DLLPREFIX_MODULE)
]) ])
@@ -1271,6 +1279,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
verbose=0 verbose=0
args="" args=""
objects="" objects=""
linking_flag="-dynamiclib"
while test \${#} -gt 0; do while test \${#} -gt 0; do
case \${1} in case \${1} in
@@ -1290,8 +1299,8 @@ while test \${#} -gt 0; do
args="\${args} \${1}" args="\${args} \${1}"
;; ;;
-dynamiclib) -dynamiclib|-bundle)
# skip these options linking_flag="\${1}"
;; ;;
-*) -*)
@@ -1329,9 +1338,9 @@ fi
# Link the shared library from the single module created # Link the shared library from the single module created
# #
if test \${verbose} = 1; then if test \${verbose} = 1; then
echo "cc -dynamiclib master.\$\$.o \${args}" echo "cc \${linking_flag} master.\$\$.o \${args}"
fi fi
c++ -dynamiclib master.\$\$.o \${args} c++ \${linking_flag} master.\$\$.o \${args}
status=\$? status=\$?
if test \${status} != 0; then if test \${status} != 0; then
exit \${status} exit \${status}
@@ -1346,8 +1355,10 @@ exit 0
EOF EOF
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o" SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_CC" SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
PIC_FLAG="-dynamic -fPIC" PIC_FLAG="-dynamic -fPIC"
dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
dnl matter for C projects and matters for C++ ones dnl matter for C projects and matters for C++ ones
@@ -1398,8 +1409,17 @@ EOF
AC_MSG_ERROR(unknown system type $host.) AC_MSG_ERROR(unknown system type $host.)
esac esac
if test "x$SHARED_LD_MODULE_CC" = "x" ; then
SHARED_LD_MODULE_CC="$SHARED_LD_CC"
fi
if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
SHARED_LD_MODULE_CC="$SHARED_LD_CXX"
fi
AC_SUBST(SHARED_LD_CC) AC_SUBST(SHARED_LD_CC)
AC_SUBST(SHARED_LD_CXX) AC_SUBST(SHARED_LD_CXX)
AC_SUBST(SHARED_LD_MODULE_CC)
AC_SUBST(SHARED_LD_MODULE_CXX)
AC_SUBST(PIC_FLAG) AC_SUBST(PIC_FLAG)
]) ])

12
autoconf_inc.m4
View File

@@ -478,3 +478,15 @@ dnl ### begin block COND_SHARED_0 ###
COND_SHARED_0="" COND_SHARED_0=""
fi fi
AC_SUBST(COND_SHARED_0) AC_SUBST(COND_SHARED_0)
dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1 ###
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1 ###
COND_TOOLKIT_OS2_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OS2_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1)

110
build/bakefiles/files.bkl
View File

@@ -561,7 +561,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/imagpnm.h wx/imagpnm.h
wx/imagtiff.h wx/imagtiff.h
wx/imagxpm.h wx/imagxpm.h
wx/joystick.h
wx/listbase.h wx/listbase.h
wx/listctrl.h wx/listctrl.h
wx/matrix.h wx/matrix.h
@@ -588,7 +587,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/statline.h wx/statline.h
wx/tab.h wx/tab.h
wx/tabctrl.h wx/tabctrl.h
wx/taskbar.h
wx/tbarbase.h wx/tbarbase.h
wx/tbarsmpl.h wx/tbarsmpl.h
wx/tglbtn.h wx/tglbtn.h
@@ -601,7 +599,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/vlbox.h wx/vlbox.h
wx/vms_x_fix.h wx/vms_x_fix.h
wx/vscroll.h wx/vscroll.h
wx/wave.h
wx/xpmdecod.h wx/xpmdecod.h
wx/xpmhand.h wx/xpmhand.h
</set> </set>
@@ -612,20 +609,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ====================================================================== --> <!-- ====================================================================== -->
<set var="XWIN_LOWLEVEL_SRC" hints="files"> <set var="XWIN_LOWLEVEL_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/caret.cpp src/generic/caret.cpp
src/generic/printps.cpp src/generic/printps.cpp
src/unix/dialup.cpp src/unix/dialup.cpp
src/unix/fontenum.cpp src/unix/fontenum.cpp
src/unix/fontutil.cpp src/unix/fontutil.cpp
src/unix/taskbarx11.cpp
src/unix/utilsx11.cpp src/unix/utilsx11.cpp
</set> </set>
<set var="XWIN_LOWLEVEL_HDR" hints="files"> <set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h wx/generic/caret.h
wx/generic/printps.h wx/generic/printps.h
wx/unix/fontutil.h wx/unix/fontutil.h
wx/unix/taskbarx11.h
wx/unix/utilsx11.h wx/unix/utilsx11.h
</set> </set>
@@ -697,7 +691,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/fontdlg.cpp src/gtk/fontdlg.cpp
src/gtk/frame.cpp src/gtk/frame.cpp
src/gtk/gauge.cpp src/gtk/gauge.cpp
src/gtk/joystick.cpp
src/gtk/listbox.cpp src/gtk/listbox.cpp
src/gtk/mdi.cpp src/gtk/mdi.cpp
src/gtk/menu.cpp src/gtk/menu.cpp
@@ -719,7 +712,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/textctrl.cpp src/gtk/textctrl.cpp
src/gtk/tglbtn.cpp src/gtk/tglbtn.cpp
src/gtk/utilsres.cpp src/gtk/utilsres.cpp
src/gtk/wave.cpp
</set> </set>
<set var="GTK_HDR" hints="files"> <set var="GTK_HDR" hints="files">
wx/generic/dirdlgg.h wx/generic/dirdlgg.h
@@ -757,7 +749,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/gauge.h wx/gtk/gauge.h
wx/gtk/gdiobj.h wx/gtk/gdiobj.h
wx/gtk/icon.h wx/gtk/icon.h
wx/gtk/joystick.h
wx/gtk/listbox.h wx/gtk/listbox.h
wx/gtk/mdi.h wx/gtk/mdi.h
wx/gtk/menu.h wx/gtk/menu.h
@@ -786,7 +777,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/tooltip.h wx/gtk/tooltip.h
wx/gtk/toplevel.h wx/gtk/toplevel.h
wx/gtk/treectrl.h wx/gtk/treectrl.h
wx/gtk/wave.h
wx/gtk/win_gtk.h wx/gtk/win_gtk.h
wx/gtk/window.h wx/gtk/window.h
</set> </set>
@@ -966,7 +956,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/x11/gdiobj.cpp src/x11/gdiobj.cpp
<!-- src/x11/gsockx11.c FIXME --> <!-- src/x11/gsockx11.c FIXME -->
src/x11/icon.cpp src/x11/icon.cpp
src/x11/joystick.cpp
src/x11/main.cpp src/x11/main.cpp
src/x11/minifram.cpp src/x11/minifram.cpp
src/x11/nanox.c src/x11/nanox.c
@@ -1002,7 +991,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/x11/font.h wx/x11/font.h
wx/x11/gdiobj.h wx/x11/gdiobj.h
wx/x11/icon.h wx/x11/icon.h
wx/x11/joystick.h
wx/x11/minifram.h wx/x11/minifram.h
wx/x11/palette.h wx/x11/palette.h
wx/x11/pen.h wx/x11/pen.h
@@ -1023,7 +1011,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ====================================================================== --> <!-- ====================================================================== -->
<set var="MSW_LOWLEVEL_SRC" hints="files"> <set var="MSW_LOWLEVEL_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/app.cpp src/msw/app.cpp
src/msw/bitmap.cpp src/msw/bitmap.cpp
src/msw/brush.cpp src/msw/brush.cpp
@@ -1051,7 +1038,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/helpchm.cpp src/msw/helpchm.cpp
src/msw/helpwin.cpp src/msw/helpwin.cpp
src/msw/icon.cpp src/msw/icon.cpp
src/msw/joystick.cpp
src/msw/minifram.cpp src/msw/minifram.cpp
src/msw/ole/automtn.cpp src/msw/ole/automtn.cpp
src/msw/ole/dataobj.cpp src/msw/ole/dataobj.cpp
@@ -1065,13 +1051,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/region.cpp src/msw/region.cpp
src/msw/renderer.cpp src/msw/renderer.cpp
src/msw/settings.cpp src/msw/settings.cpp
src/msw/taskbar.cpp
src/msw/timer.cpp src/msw/timer.cpp
src/msw/tooltip.cpp src/msw/tooltip.cpp
src/msw/toplevel.cpp src/msw/toplevel.cpp
src/msw/utilsgui.cpp src/msw/utilsgui.cpp
src/msw/uxtheme.cpp src/msw/uxtheme.cpp
src/msw/wave.cpp
src/msw/window.cpp src/msw/window.cpp
</set> </set>
<set var="MSW_LOWLEVEL_HDR" hints="files"> <set var="MSW_LOWLEVEL_HDR" hints="files">
@@ -1168,7 +1152,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/icon.h wx/msw/icon.h
wx/msw/imaglist.h wx/msw/imaglist.h
wx/msw/iniconf.h wx/msw/iniconf.h
wx/msw/joystick.h
wx/msw/listbox.h wx/msw/listbox.h
wx/msw/listctrl.h wx/msw/listctrl.h
wx/msw/mdi.h wx/msw/mdi.h
@@ -1212,7 +1195,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/statline.h wx/msw/statline.h
wx/msw/stattext.h wx/msw/stattext.h
wx/msw/tabctrl.h wx/msw/tabctrl.h
wx/msw/taskbar.h
wx/msw/tbar95.h wx/msw/tbar95.h
wx/msw/tbarmsw.h wx/msw/tbarmsw.h
wx/msw/textctrl.h wx/msw/textctrl.h
@@ -1221,7 +1203,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/tooltip.h wx/msw/tooltip.h
wx/msw/toplevel.h wx/msw/toplevel.h
wx/msw/treectrl.h wx/msw/treectrl.h
wx/msw/wave.h
wx/msw/window.h wx/msw/window.h
<!-- Resources must be installed together with headers: --> <!-- Resources must be installed together with headers: -->
@@ -1375,7 +1356,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/os2/helpwin.cpp src/os2/helpwin.cpp
src/os2/icon.cpp src/os2/icon.cpp
src/os2/iniconf.cpp src/os2/iniconf.cpp
src/os2/joystick.cpp
src/os2/listbox.cpp src/os2/listbox.cpp
src/os2/main.cpp src/os2/main.cpp
src/os2/menu.cpp src/os2/menu.cpp
@@ -1408,7 +1388,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/os2/toolbar.cpp src/os2/toolbar.cpp
src/os2/tooltip.cpp src/os2/tooltip.cpp
src/os2/toplevel.cpp src/os2/toplevel.cpp
src/os2/wave.cpp
src/os2/window.cpp src/os2/window.cpp
</set> </set>
<set var="OS2_HDR" hints="files"> <set var="OS2_HDR" hints="files">
@@ -1448,7 +1427,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/os2/helpwin.h wx/os2/helpwin.h
wx/os2/icon.h wx/os2/icon.h
wx/os2/iniconf.h wx/os2/iniconf.h
wx/os2/joystick.h
wx/os2/listbox.h wx/os2/listbox.h
wx/os2/menu.h wx/os2/menu.h
wx/os2/menuitem.h wx/os2/menuitem.h
@@ -1481,7 +1459,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/os2/toolbar.h wx/os2/toolbar.h
wx/os2/tooltip.h wx/os2/tooltip.h
wx/os2/toplevel.h wx/os2/toplevel.h
wx/os2/wave.h
wx/os2/window.h wx/os2/window.h
</set> </set>
@@ -1531,7 +1508,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/mac/gauge.cpp src/mac/gauge.cpp
src/mac/gdiobj.cpp src/mac/gdiobj.cpp
src/mac/icon.cpp src/mac/icon.cpp
src/mac/joystick.cpp
src/mac/listbox.cpp src/mac/listbox.cpp
src/mac/macnotfy.cpp src/mac/macnotfy.cpp
src/mac/mdi.cpp src/mac/mdi.cpp
@@ -1568,7 +1544,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/mac/tooltip.cpp src/mac/tooltip.cpp
src/mac/toplevel.cpp src/mac/toplevel.cpp
src/mac/uma.cpp src/mac/uma.cpp
src/mac/wave.cpp
src/mac/window.cpp src/mac/window.cpp
<!-- Generic implementations used by wxMac: --> <!-- Generic implementations used by wxMac: -->
src/generic/caret.cpp src/generic/caret.cpp
@@ -1620,7 +1595,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/mac/helpxxxx.h wx/mac/helpxxxx.h
wx/mac/icon.h wx/mac/icon.h
wx/mac/imaglist.h wx/mac/imaglist.h
wx/mac/joystick.h
wx/mac/listbox.h wx/mac/listbox.h
wx/mac/listctrl.h wx/mac/listctrl.h
wx/mac/macnotfy.h wx/mac/macnotfy.h
@@ -1660,7 +1634,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/mac/toplevel.h wx/mac/toplevel.h
wx/mac/treectrl.h wx/mac/treectrl.h
wx/mac/uma.h wx/mac/uma.h
wx/mac/wave.h
wx/mac/window.h wx/mac/window.h
<!-- Generic implementations used by wxMac: --> <!-- Generic implementations used by wxMac: -->
wx/generic/caret.h wx/generic/caret.h
@@ -1941,12 +1914,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxAdvanced --> <!-- wxAdvanced -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<set var="ADVANCED_MSW_SRC" hints="files">
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
</set>
<set var="ADVANCED_CMN_SRC" hints="files"> <set var="ADVANCED_CMN_SRC" hints="files">
src/common/dbgrid.cpp src/common/dbgrid.cpp
src/generic/calctrl.cpp src/generic/calctrl.cpp
@@ -1976,13 +1943,58 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/splash.h wx/generic/splash.h
wx/generic/wizard.h wx/generic/wizard.h
wx/grid.h wx/grid.h
wx/joystick.h
wx/laywin.h wx/laywin.h
wx/sashwin.h wx/sashwin.h
wx/splash.h wx/splash.h
wx/taskbar.h
wx/tipdlg.h wx/tipdlg.h
wx/wave.h
wx/wizard.h wx/wizard.h
</set> </set>
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/joystick.cpp
src/msw/taskbar.cpp
src/msw/wave.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
wx/msw/joystick.h
wx/msw/taskbar.h
wx/msw/wave.h
</set>
<set var="ADVANCED_MAC_SRC" hints="files">
src/mac/joystick.cpp
src/mac/wave.cpp
</set>
<set var="ADVANCED_MAC_HDR" hints="files">
wx/mac/joystick.h
wx/mac/wave.h
</set>
<set var="ADVANCED_OS2_SRC" hints="files">
src/os2/joystick.cpp
src/os2/wave.cpp
</set>
<set var="ADVANCED_OS2_HDR" hints="files">
wx/os2/joystick.h
wx/os2/wave.h
</set>
<set var="ADVANCED_UNIX_SRC" hints="files">
src/common/taskbarcmn.cpp
src/unix/joystick.cpp
src/unix/taskbarx11.cpp
src/unix/wave.cpp
</set>
<set var="ADVANCED_UNIX_HDR" hints="files">
wx/unix/joystick.h
wx/unix/taskbarx11.h
wx/unix/wave.h
</set>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- wxHTML --> <!-- wxHTML -->
@@ -2135,17 +2147,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(NET_CMN_SRC) $(NET_PLATFORM_SRC) $(NET_CMN_SRC) $(NET_PLATFORM_SRC)
</set> </set>
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
</set>
<set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
<set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
<!-- GUI sources: --> <!-- GUI sources: -->
@@ -2195,6 +2196,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC) $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if> </if>
</set> </set>
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_HDR)</if>
</set>
<set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
<set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
<set var="ALL_GUI_HEADERS" hints="files"> <set var="ALL_GUI_HEADERS" hints="files">

63
configure vendored
View File

@@ -312,7 +312,7 @@ ac_includes_default="\
#endif" #endif"
ac_subdirs_all="$ac_subdirs_all src/expat" ac_subdirs_all="$ac_subdirs_all src/expat"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@@ -31485,19 +31485,9 @@ if test "$wxUSE_GUI" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5 { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;} echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" = "MOTIF"; then
{ echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Motif... disabled" >&5
echo "$as_me: WARNING: Joystick not yet supported under Motif... disabled" >&2;}
wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" = "X11"; then
{ echo "$as_me:$LINENO: WARNING: Joystick not yet supported under X11... disabled" >&5
echo "$as_me: WARNING: Joystick not yet supported under X11... disabled" >&2;}
wxUSE_JOYSTICK=no
fi fi
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then if test "$wxUSE_JOYSTICK" = "yes"; then
for ac_header in linux/joystick.h for ac_header in linux/joystick.h
@@ -33113,7 +33103,8 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
#define wxUSE_SYSTEM_OPTIONS 1 #define wxUSE_SYSTEM_OPTIONS 1
_ACEOF _ACEOF
if test "$TOOLKIT" = "MSW"; then if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
"$TOOLKIT" = "MOTIF"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
fi fi
@@ -34194,18 +34185,23 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
SO_SUFFIX="so" SO_SUFFIX="so"
SO_SUFFIX_MODULE="so"
EXEEXT="" EXEEXT=""
DLLPREFIX=lib DLLPREFIX=lib
DLLPREFIX_MODULE=
case "${host}" in case "${host}" in
*-hp-hpux* ) *-hp-hpux* )
SO_SUFFIX="sl" SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;; ;;
*-*-aix* ) *-*-aix* )
SO_SUFFIX="a" SO_SUFFIX="a"
SO_SUFFIX_MODULE="a"
;; ;;
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll"
EXEEXT=".exe" EXEEXT=".exe"
DLLPREFIX="" DLLPREFIX=""
;; ;;
@@ -34215,6 +34211,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
;; ;;
powerpc-*-darwin* ) powerpc-*-darwin* )
SO_SUFFIX="dylib" SO_SUFFIX="dylib"
SO_SUFFIX_MODULE="bundle"
;; ;;
esac esac
@@ -34223,6 +34220,8 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
SHARED_LD_CC="\$(CC) -shared -o" SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o" SHARED_LD_CXX="\$(CXX) -shared -o"
@@ -34329,6 +34328,7 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6
verbose=0 verbose=0
args="" args=""
objects="" objects=""
linking_flag="-dynamiclib"
while test \${#} -gt 0; do while test \${#} -gt 0; do
case \${1} in case \${1} in
@@ -34348,8 +34348,8 @@ while test \${#} -gt 0; do
args="\${args} \${1}" args="\${args} \${1}"
;; ;;
-dynamiclib) -dynamiclib|-bundle)
# skip these options linking_flag="\${1}"
;; ;;
-*) -*)
@@ -34387,9 +34387,9 @@ fi
# Link the shared library from the single module created # Link the shared library from the single module created
# #
if test \${verbose} = 1; then if test \${verbose} = 1; then
echo "cc -dynamiclib master.\$\$.o \${args}" echo "cc \${linking_flag} master.\$\$.o \${args}"
fi fi
c++ -dynamiclib master.\$\$.o \${args} c++ \${linking_flag} master.\$\$.o \${args}
status=\$? status=\$?
if test \${status} != 0; then if test \${status} != 0; then
exit \${status} exit \${status}
@@ -34404,8 +34404,10 @@ exit 0
EOF EOF
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o" SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
SHARED_LD_CXX="$SHARED_LD_CC" SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
PIC_FLAG="-dynamic -fPIC" PIC_FLAG="-dynamic -fPIC"
;; ;;
@@ -34480,6 +34482,15 @@ echo "$as_me: error: unknown system type $host." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
esac esac
if test "x$SHARED_LD_MODULE_CC" = "x" ; then
SHARED_LD_MODULE_CC="$SHARED_LD_CC"
fi
if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
SHARED_LD_MODULE_CC="$SHARED_LD_CXX"
fi
@@ -35128,6 +35139,16 @@ fi
COND_SHARED_0="" COND_SHARED_0=""
fi fi
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
COND_TOOLKIT_OS2_USE_GUI_1="#"
if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_OS2_USE_GUI_1=""
fi
@@ -36033,10 +36054,14 @@ s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
s,@SO_SUFFIX@,$SO_SUFFIX,;t t s,@SO_SUFFIX@,$SO_SUFFIX,;t t
s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
s,@DLLPREFIX@,$DLLPREFIX,;t t s,@DLLPREFIX@,$DLLPREFIX,;t t
s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
s,@PIC_FLAG@,$PIC_FLAG,;t t s,@PIC_FLAG@,$PIC_FLAG,;t t
s,@USE_SOVERSION@,$USE_SOVERSION,;t t s,@USE_SOVERSION@,$USE_SOVERSION,;t t
s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
@@ -36124,6 +36149,8 @@ s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_SHARED_1@,$COND_SHARED_1,;t t
s,@COND_SHARED_0@,$COND_SHARED_0,;t t s,@COND_SHARED_0@,$COND_SHARED_0,;t t
s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t
s,@LEX_STEM@,$LEX_STEM,;t t s,@LEX_STEM@,$LEX_STEM,;t t
s,@PATH_IFS@,$PATH_IFS,;t t s,@PATH_IFS@,$PATH_IFS,;t t
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t

15
configure.in
View File

@@ -4618,16 +4618,8 @@ if test "$wxUSE_GUI" = "yes"; then
AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled]) AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
fi fi
if test "$TOOLKIT" = "MOTIF"; then
AC_MSG_WARN([Joystick not yet supported under Motif... disabled]) dnl under MSW we always have joystick support
wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" = "X11"; then
AC_MSG_WARN([Joystick not yet supported under X11... disabled])
wxUSE_JOYSTICK=no
fi
dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then if test "$wxUSE_JOYSTICK" = "yes"; then
dnl joystick support is only for Linux 2.1.x or greater dnl joystick support is only for Linux 2.1.x or greater
@@ -5232,7 +5224,8 @@ fi
if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
AC_DEFINE(wxUSE_SYSTEM_OPTIONS) AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
if test "$TOOLKIT" = "MSW"; then if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
"$TOOLKIT" = "MOTIF"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
fi fi

2
include/wx/msw/joystick.h
View File

@@ -18,7 +18,7 @@
#include "wx/event.h" #include "wx/event.h"
class WXDLLEXPORT wxJoystick: public wxObject class WXDLLIMPEXP_ADV wxJoystick: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxJoystick) DECLARE_DYNAMIC_CLASS(wxJoystick)
public: public:

5
include/wx/msw/taskbar.h
View File

@@ -22,9 +22,10 @@
class wxTaskBarIcon; class wxTaskBarIcon;
WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList); WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
class WXDLLIMPEXP_ADV);
class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon) DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public: public:

2
include/wx/msw/wave.h
View File

@@ -20,7 +20,7 @@
#include "wx/object.h" #include "wx/object.h"
class WXDLLEXPORT wxWave : public wxObject class WXDLLIMPEXP_ADV wxWave : public wxObject
{ {
public: public:
wxWave(); wxWave();

18
include/wx/taskbar.h
View File

@@ -11,7 +11,7 @@
// wxTaskBarIconBase: define wxTaskBarIcon interface // wxTaskBarIconBase: define wxTaskBarIcon interface
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler class WXDLLIMPEXP_ADV wxTaskBarIconBase : public wxEvtHandler
{ {
public: public:
wxTaskBarIconBase() { } wxTaskBarIconBase() { }
@@ -35,7 +35,7 @@ private:
// wxTaskBarIcon events // wxTaskBarIcon events
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxTaskBarIconEvent : public wxEvent class WXDLLIMPEXP_ADV wxTaskBarIconEvent : public wxEvent
{ {
public: public:
wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon) wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)
@@ -51,13 +51,13 @@ private:
}; };
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_MOVE, 1550 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_MOVE,1550)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN, 1551 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DOWN,1551)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP, 1552 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_UP,1552)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN, 1553 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DOWN,1553)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP, 1554 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_UP,1554)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK, 1555 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DCLICK,1555)
DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK, 1556 ) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DCLICK,1556)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
#define EVT_TASKBAR_MOVE(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL), #define EVT_TASKBAR_MOVE(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),