vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Apr 1 12:03:22 2012 +0300| [c063b82100df5f3b2a65311529eafa2ee3f41262] | committer: Rémi Denis-Courmont
Qt4: fix disc dialog on Linux (again) 5a2390a78863423a6b5108debd1c6939ac5ab38a is the first bad commit commit 5a2390a78863423a6b5108debd1c6939ac5ab38a Author: Jean-Baptiste Kempf <[email protected]> Date: Sat Mar 31 22:20:58 2012 +0200 (cherry picked from commit 0041fd5c1d6dec6ff43a5e1ecabfcb028e2f10f3) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=c063b82100df5f3b2a65311529eafa2ee3f41262 --- modules/gui/qt4/components/open_panels.cpp | 4 ++-- modules/gui/qt4/components/open_panels.hpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 117e67a..61dbed6 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -371,10 +371,10 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : updateButtons(); } +#ifdef WIN32 /* Disc drives probing for Windows */ void DiscOpenPanel::onFocus() { ui.deviceCombo->clear(); -#ifdef WIN32 /* Disc drives probing for Windows */ wchar_t szDrives[512]; szDrives[0] = '\0'; if( GetLogicalDriveStringsW( sizeof( szDrives ) - 1, szDrives ) ) @@ -403,8 +403,8 @@ void DiscOpenPanel::onFocus() } SetErrorMode(oldMode); } -#endif } +#endif DiscOpenPanel::~DiscOpenPanel() { diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp index d564e24..51c65ff 100644 --- a/modules/gui/qt4/components/open_panels.hpp +++ b/modules/gui/qt4/components/open_panels.hpp @@ -174,7 +174,9 @@ public: virtual ~DiscOpenPanel(); virtual void clear() ; virtual void accept() ; +#ifdef WIN32 void onFocus(); +#endif private: Ui::OpenDisk ui; char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
