[vlc-commits] qt4: only build main_interface_win32.cpp for windows

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Jul 10 21:34:35 2011 -0400| [e01150e538bbb5dc34b2bee703cf2b731d59b24c] | committer: Rafaël Carré

qt4: only build main_interface_win32.cpp for windows

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e01150e538bbb5dc34b2bee703cf2b731d59b24c
---

 modules/gui/qt4/Modules.am               |    5 ++++-
 modules/gui/qt4/main_interface.hpp       |    2 ++
 modules/gui/qt4/main_interface_win32.cpp |   11 ++---------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 5ad68ce..8ebfab3 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -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 \
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index aed2b1e..d96d6cb 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.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,
diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp
index d57730b..cdb3f0e 100644
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -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
 }
-
-