Commit 688eedc9 authored by Pavlov Konstantin's avatar Pavlov Konstantin

Introduce HAVE_WX and HAVE_QT4 and show "Switch to WX" in QT4 only if built with WX

parent e2dcc023
...@@ -5194,6 +5194,7 @@ then ...@@ -5194,6 +5194,7 @@ then
if test "${ac_cv_wx_headers}" = "yes" if test "${ac_cv_wx_headers}" = "yes"
then then
VLC_ADD_PLUGINS([wxwidgets]) VLC_ADD_PLUGINS([wxwidgets])
AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.])
ALIASES="${ALIASES} wxvlc" ALIASES="${ALIASES} wxvlc"
fi fi
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
...@@ -5213,6 +5214,7 @@ AS_IF([test "${enable_qt4}" != "no" && ...@@ -5213,6 +5214,7 @@ AS_IF([test "${enable_qt4}" != "no" &&
(test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [ (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0], PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0],
[ VLC_ADD_PLUGINS([qt4]) [ VLC_ADD_PLUGINS([qt4])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc" ALIASES="${ALIASES} qvlc"
enableqt4=true enableqt4=true
VLC_ADD_LIBS([qt4],[$QT4_LIBS]) VLC_ADD_LIBS([qt4],[$QT4_LIBS])
......
...@@ -332,11 +332,13 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) ...@@ -332,11 +332,13 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
menu->addSeparator(); menu->addSeparator();
menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ), menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
QString( "Ctrl+Z" ) ); QString( "Ctrl+Z" ) );
#ifdef HAVE_WX
if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) ) if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
{ {
menu->addAction( qtr( "Switch to WxWidgets" ), THEDP, menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
SLOT( switchToWx() ) ); SLOT( switchToWx() ) );
} }
#endif
} }
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment