Copy some missing samples, and contrib for Motif/Mac

[wxWidgets.git] / contrib / include / wx / mmedia / cdunix.h

diff --git a/contrib/include/wx/mmedia/cdunix.h b/contrib/include/wx/mmedia/cdunix.h
index 8c7c3544e2f9d6a35f751382d5f273dcdc69d58f..9745add9dc8dee0ef53e0dc4b0db63e2c7186e09 100644 (file)
--- a/contrib/include/wx/mmedia/cdunix.h
+++ b/contrib/include/wx/mmedia/cdunix.h
@@ -10,17 +10,18 @@
 #ifndef __CDUNIXH__
 #define __CDUNIXH__
 
 #ifndef __CDUNIXH__
 #define __CDUNIXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "cdunix.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #pragma interface "cdunix.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/mmedia/defs.h"

 #include "wx/mmedia/cdbase.h"
 
 ///
 #include "wx/mmedia/cdbase.h"
 
 ///

-class WXDLLEXPORT wxCDAudioLinux : public wxCDAudio {
+class WXDLLIMPEXP_MMEDIA wxCDAudioLinux : public wxCDAudio {

   DECLARE_DYNAMIC_CLASS(wxCDAudioLinux)
 protected:
   wxCDtime m_time;
   DECLARE_DYNAMIC_CLASS(wxCDAudioLinux)
 protected:
   wxCDtime m_time;