Add samples to configure: ipc, keyboard, listbox, multimon, popup, vscroll

richedit (partly), regtest, nativdlg, oleauto


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-03-01 17:08:52 +00:00
parent 21fe01e299
commit 0b78747f48
2 changed files with 60 additions and 12 deletions

44
configure vendored

File diff suppressed because one or more lines are too long

View File

@@ -4892,6 +4892,9 @@ if test "$wxUSE_LOG" = "yes"; then
if test "$wxUSE_LOGDIALOG" = "yes"; then if test "$wxUSE_LOGDIALOG" = "yes"; then
AC_DEFINE(wxUSE_LOG_DIALOG) AC_DEFINE(wxUSE_LOG_DIALOG)
fi fi
dnl the keyboard sample requires wxUSE_LOG
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard"
fi fi
if test "$wxUSE_LONGLONG" = "yes"; then if test "$wxUSE_LONGLONG" = "yes"; then
@@ -5423,6 +5426,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
if test "$wxUSE_OLE" = "yes" ; then if test "$wxUSE_OLE" = "yes" ; then
AC_DEFINE(wxUSE_OLE) AC_DEFINE(wxUSE_OLE)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
fi fi
fi fi
@@ -5448,11 +5452,15 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
fi fi
if test "$wxUSE_IPC" = "yes"; then if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then
AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled) AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
wxUSE_IPC=no
fi fi
if test "$wxUSE_IPC" = "yes"; then
AC_DEFINE(wxUSE_IPC) AC_DEFINE(wxUSE_IPC)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
fi
fi fi
if test "$wxUSE_CLIPBOARD" = "yes"; then if test "$wxUSE_CLIPBOARD" = "yes"; then
@@ -5575,7 +5583,7 @@ fi
if test "$wxUSE_DISPLAY" = "yes"; then if test "$wxUSE_DISPLAY" = "yes"; then
AC_DEFINE(wxUSE_DISPLAY) AC_DEFINE(wxUSE_DISPLAY)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
fi fi
if test "$wxUSE_GAUGE" = "yes"; then if test "$wxUSE_GAUGE" = "yes"; then
@@ -5601,6 +5609,7 @@ fi
if test "$wxUSE_LISTBOX" = "yes"; then if test "$wxUSE_LISTBOX" = "yes"; then
AC_DEFINE(wxUSE_LISTBOX) AC_DEFINE(wxUSE_LISTBOX)
USES_CONTROLS=1 USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
fi fi
if test "$wxUSE_LISTCTRL" = "yes"; then if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -5779,6 +5788,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
else else
AC_DEFINE(wxUSE_POPUPWIN) AC_DEFINE(wxUSE_POPUPWIN)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
USES_CONTROLS=1 USES_CONTROLS=1
fi fi
@@ -6260,15 +6270,17 @@ if test "$wxUSE_GUI" = "yes"; then
dnl TODO add checks that these samples will really compile (i.e. all the dnl TODO add checks that these samples will really compile (i.e. all the
dnl library features they need are present) dnl library features they need are present)
dnl TODO some samples are never built so far: dnl TODO some samples are never built so far: mfc, ownerdrw
dnl ipc, mfc, nativdlg, oleauto, ownerdrw
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \ drawing dynamic erase event exec font image \
minimal propsize rotate shaped widgets render" minimal propsize rotate shaped vscroll widgets render"
if test "$wxUSE_MONOLITHIC" != "yes"; then if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
fi fi
if test "$TOOLKIT" = "MSW"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nativdlg regtest richedit"
fi
else else
SAMPLES_SUBDIRS="console" SAMPLES_SUBDIRS="console"
fi fi