Richtext interface fixes and additions for Phoenix

[wxWidgets.git] / include / wx / motif / bmpmotif.h

diff --git a/include/wx/motif/bmpmotif.h b/include/wx/motif/bmpmotif.h
index 58eba0aa1e0415ef4de57ac89f861cb63627b552..a176e90fc0a714aa8b0a4dd6b038047152bb4e93 100644 (file)
--- a/include/wx/motif/bmpmotif.h
+++ b/include/wx/motif/bmpmotif.h
@@ -1,25 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpmotif.h
+// Name:        wx/motif/bmpmotif.h

 // Purpose:     Motif-specific bitmap routines
 // Author:      Julian Smart, originally in bitmap.h
 // Modified by:
 // Created:     25/03/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Motif-specific bitmap routines
 // Author:      Julian Smart, originally in bitmap.h
 // Modified by:
 // Created:     25/03/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPMOTIF_H_
 #define _WX_BMPMOTIF_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPMOTIF_H_
 #define _WX_BMPMOTIF_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bmpmotif.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/bitmap.h"
 
 #include "wx/defs.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBitmapCache
+class WXDLLIMPEXP_CORE wxBitmapCache

 {
 public:
     wxBitmapCache()
 {
 public:
     wxBitmapCache()


@@ -28,7 +24,7 @@ public:
         m_armPixmap = (WXPixmap)NULL;
         m_insensPixmap = (WXPixmap)NULL;
         m_image = (WXImage)NULL;
         m_armPixmap = (WXPixmap)NULL;
         m_insensPixmap = (WXPixmap)NULL;
         m_image = (WXImage)NULL;

-        m_display = (WXDisplay*)NULL;
+        m_display = NULL;

         SetColoursChanged();
     }
 
         SetColoursChanged();
     }