Commit e01150e5 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

qt4: only build main_interface_win32.cpp for windows

parent 52bab2a6
......@@ -246,7 +246,6 @@ endif
SOURCES_qt4 = qt4.cpp \
menus.cpp \
main_interface.cpp \
main_interface_win32.cpp \
dialogs_provider.cpp \
input_manager.cpp \
actions_manager.cpp \
......@@ -315,6 +314,10 @@ if HAVE_DARWIN
SOURCES_qt4 += util/searchlineedit_mac.mm
endif
if HAVE_WIN32
SOURCES_qt4 += main_interface_win32.cpp
endif
noinst_HEADERS = \
qt4.hpp \
menus.hpp \
......
......@@ -194,7 +194,9 @@ public slots:
void setStatusBarVisibility(bool b_visible);
void popupMenu( const QPoint& );
#ifdef WIN32
void changeThumbbarButtons( int );
#endif
/* Manage the Video Functions from the vout threads */
void getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
......
......@@ -27,9 +27,8 @@
#include "input_manager.hpp"
#include "actions_manager.hpp"
#ifdef WIN32
#include <QBitmap>
#include <vlc_windows_interfaces.h>
#include <QBitmap>
#include <vlc_windows_interfaces.h>
#define WM_APPCOMMAND 0x0319
......@@ -237,12 +236,9 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
}
return false;
}
#endif
//moc doesn't know about #ifdef, so we have to build this method for every platform
void MainInterface::changeThumbbarButtons( int i_status)
{
#ifdef WIN32
// Define an array of three buttons. These buttons provide images through an
// image list and also provide tooltips.
DWORD dwMask = THB_BITMAP | THB_FLAGS;
......@@ -289,7 +285,4 @@ void MainInterface::changeThumbbarButtons( int i_status)
HRESULT hr = p_taskbl->vt->ThumbBarUpdateButtons(p_taskbl, this->winId(), 3, thbButtons);
if(S_OK != hr)
msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08lx", hr );
#endif
}
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