Commit c063b821 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: fix disc dialog on Linux (again)

5a2390a7 is the first bad commit
commit 5a2390a7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Mar 31 22:20:58 2012 +0200
(cherry picked from commit 0041fd5c)
parent e7ffa08f
...@@ -371,10 +371,10 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -371,10 +371,10 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
updateButtons(); updateButtons();
} }
#ifdef WIN32 /* Disc drives probing for Windows */
void DiscOpenPanel::onFocus() void DiscOpenPanel::onFocus()
{ {
ui.deviceCombo->clear(); ui.deviceCombo->clear();
#ifdef WIN32 /* Disc drives probing for Windows */
wchar_t szDrives[512]; wchar_t szDrives[512];
szDrives[0] = '\0'; szDrives[0] = '\0';
if( GetLogicalDriveStringsW( sizeof( szDrives ) - 1, szDrives ) ) if( GetLogicalDriveStringsW( sizeof( szDrives ) - 1, szDrives ) )
...@@ -403,8 +403,8 @@ void DiscOpenPanel::onFocus() ...@@ -403,8 +403,8 @@ void DiscOpenPanel::onFocus()
} }
SetErrorMode(oldMode); SetErrorMode(oldMode);
} }
#endif
} }
#endif
DiscOpenPanel::~DiscOpenPanel() DiscOpenPanel::~DiscOpenPanel()
{ {
......
...@@ -174,7 +174,9 @@ public: ...@@ -174,7 +174,9 @@ public:
virtual ~DiscOpenPanel(); virtual ~DiscOpenPanel();
virtual void clear() ; virtual void clear() ;
virtual void accept() ; virtual void accept() ;
#ifdef WIN32
void onFocus(); void onFocus();
#endif
private: private:
Ui::OpenDisk ui; Ui::OpenDisk ui;
char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath; char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath;
......
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