wxFrameLayout contains wxPen by value, so the wxPen class declaration from wx/pen...

[wxWidgets.git] / contrib / src / mmedia / cdunix.cpp

diff --git a/contrib/src/mmedia/cdunix.cpp b/contrib/src/mmedia/cdunix.cpp
index 5a8f42de6112044b96b10e6c3c9ce888028eeff4..936eeef4d2629bb0feeccfe284a0a78701af91cf 100644 (file)
--- a/contrib/src/mmedia/cdunix.cpp
+++ b/contrib/src/mmedia/cdunix.cpp
@@ -22,6 +22,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if HAVE_KNOWN_CDROM_INTERFACE
+

 // ---------------------------------------------------------------------------
 // MMedia headers
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // MMedia headers
 // ---------------------------------------------------------------------------


@@ -55,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCDAudioLinux, wxCDAudio)
 wxCDAudioLinux::wxCDAudioLinux()
     : wxCDAudio(), m_fd(-1)
 {
 wxCDAudioLinux::wxCDAudioLinux()
     : wxCDAudio(), m_fd(-1)
 {

-  OpenDevice("/dev/cdrom");
+  OpenDevice(wxT("/dev/cdrom"));

 }
 
 wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name)
 }
 
 wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name)


@@ -78,7 +80,7 @@ void wxCDAudioLinux::OpenDevice(const wxString& dev_name)
   struct cdrom_tocentry entry, old_entry;
   struct cdrom_tochdr diskinf;
   struct cdrom_msf0 *msf = &entry.cdte_addr.msf,
   struct cdrom_tocentry entry, old_entry;
   struct cdrom_tochdr diskinf;
   struct cdrom_msf0 *msf = &entry.cdte_addr.msf,

-                   *old_msf = &old_entry.cdte_addr.msf;
+              *old_msf = &old_entry.cdte_addr.msf;

   wxCDtime *the_track;
   wxCDtime tot_tm;
   wxUint8 nb_tracks, i;
   wxCDtime *the_track;
   wxCDtime tot_tm;
   wxUint8 nb_tracks, i;


@@ -216,3 +218,5 @@ wxCDAudio::CDtoc& wxCDAudioLinux::GetToc()
 {
   return *m_toc;
 }
 {
   return *m_toc;
 }

+
+#endif