Updated to Scintilla 1.54

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

diff --git a/contrib/include/wx/mmedia/cdbase.h b/contrib/include/wx/mmedia/cdbase.h
index 8b86d89236e81cff5fd6eaef160c87e9f6866233..bc70cfa78fc8c5622e4105ff0c5b4bd12cdb5e63 100644 (file)
--- a/contrib/include/wx/mmedia/cdbase.h
+++ b/contrib/include/wx/mmedia/cdbase.h
@@ -10,24 +10,25 @@
 #ifndef __CDA_base_H__
 #define __CDA_base_H__
 
 #ifndef __CDA_base_H__
 #define __CDA_base_H__
 

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

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

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

 
 typedef struct wxCDtime {
   wxUint8 track;
   wxUint8 hour, min, sec;
 } wxCDtime;
 
 
 typedef struct wxCDtime {
   wxUint8 track;
   wxUint8 hour, min, sec;
 } wxCDtime;
 

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

   DECLARE_ABSTRACT_CLASS(wxCDAudio)
 public:
   typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
   // Table of contents manager
   DECLARE_ABSTRACT_CLASS(wxCDAudio)
 public:
   typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
   // Table of contents manager

-  class WXDLLEXPORT CDtoc {
+  class WXDLLIMPEXP_MMEDIA CDtoc {

   protected:
     wxCDtime *tracks_time, *tracks_pos;
     wxCDtime total_time;
   protected:
     wxCDtime *tracks_time, *tracks_pos;
     wxCDtime total_time;