Commit 2573062f authored by Kaarlo Raiha's avatar Kaarlo Raiha Committed by Rémi Denis-Courmont

QT4 wineventfilter for Win32, allows WM_APPCOMMAND stuff

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent 747e5690
...@@ -220,6 +220,19 @@ vlc_module_begin(); ...@@ -220,6 +220,19 @@ vlc_module_begin();
#endif #endif
vlc_module_end(); vlc_module_end();
#if defined(Q_WS_WIN)
bool WinQtApp::winEventFilter( MSG *msg, long *result )
{
switch( msg->message )
{
case 0x0319: /* WM_APPCOMMAND 0x0319 */
DefWindowProc( msg->hwnd, msg->message, msg->wParam, msg->lParam );
break;
}
return false;
}
#endif /* Q_WS_WIN */
/***************************************************************************** /*****************************************************************************
* Module callbacks * Module callbacks
*****************************************************************************/ *****************************************************************************/
...@@ -334,7 +347,11 @@ static void *Init( vlc_object_t *obj ) ...@@ -334,7 +347,11 @@ static void *Init( vlc_object_t *obj )
#endif #endif
/* Start the QApplication here */ /* Start the QApplication here */
#ifdef WIN32
WinQtApp *app = new WinQtApp( argc, argv , true );
#else
QApplication *app = new QApplication( argc, argv , true ); QApplication *app = new QApplication( argc, argv , true );
#endif
p_intf->p_sys->p_app = app; p_intf->p_sys->p_app = app;
p_intf->p_sys->mainSettings = new QSettings( p_intf->p_sys->mainSettings = new QSettings(
......
...@@ -48,6 +48,19 @@ class DialogsProvider; ...@@ -48,6 +48,19 @@ class DialogsProvider;
class VideoWidget; class VideoWidget;
class QSettings; class QSettings;
#if defined(Q_WS_WIN)
#include <QApplication>
class WinQtApp : public QApplication
{
public:
WinQtApp ( int & argc, char ** argv, bool GUIenabled ) : QApplication( argc, argv, GUIenabled ) {}
~WinQtApp() {}
protected:
bool winEventFilter(MSG *msg, long *result);
};
#endif /* Q_WS_WIN */
struct intf_sys_t struct intf_sys_t
{ {
QApplication *p_app; QApplication *p_app;
......
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