Update to Scintilla 1.48

[wxWidgets.git] / include / wx / mac / bitmap.h

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 1760cca7b8b7412ed0a557e1691bec4c5398bbea..dae1493b874960ffb55e76a93feb22f038c27f2f 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 

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

   #pragma interface "bitmap.h"
 #endif
 
   #pragma interface "bitmap.h"
 #endif
 


@@ -31,7 +31,8 @@ class WXDLLEXPORT wxImage;
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
 {
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxMask)
+    DECLARE_DYNAMIC_CLASS(wxMask)
+    DECLARE_NO_COPY_CLASS(wxMask)

 
 public:
   wxMask();
 
 public:
   wxMask();


@@ -65,6 +66,8 @@ enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict ,
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {

+    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+        

     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;


@@ -81,10 +84,10 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
   wxPalette     m_bitmapPalette;
   int           m_quality;
 

-       int                     m_bitmapType ;
-       WXHMETAFILE     m_hPict ;
-       WXHBITMAP   m_hBitmap;
-       WXHICON     m_hIcon ;
+  int          m_bitmapType ;
+  WXHMETAFILE  m_hPict ;
+  WXHBITMAP     m_hBitmap;
+  WXHICON       m_hIcon ;

   wxMask *      m_bitmapMask; // Optional mask
 };
 
   wxMask *      m_bitmapMask; // Optional mask
 };
 


@@ -94,22 +97,21 @@ class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 public:

-  wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };
-#ifdef __DARWIN__
-  virtual ~wxBitmapHandler() { }
-#endif
+  wxBitmapHandler() : m_name(), m_extension(), m_type(0) { }
+  virtual ~wxBitmapHandler();

 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
   virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 
 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
   virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 

-  inline void SetName(const wxString& name) { m_name = name; }
-  inline void SetExtension(const wxString& ext) { m_extension = ext; }
-  inline void SetType(long type) { m_type = type; }
-  inline wxString GetName() const { return m_name; }
-  inline wxString GetExtension() const { return m_extension; }
-  inline long GetType() const { return m_type; }
+  void SetName(const wxString& name) { m_name = name; }
+  void SetExtension(const wxString& ext) { m_extension = ext; }
+  void SetType(long type) { m_type = type; }
+  wxString GetName() const { return m_name; }
+  wxString GetExtension() const { return m_extension; }
+  long GetType() const { return m_type; }
+

 protected:
   wxString  m_name;
   wxString  m_extension;
 protected:
   wxString  m_name;
   wxString  m_extension;


@@ -128,7 +130,8 @@ public:
   wxBitmap(); // Platform-specific
 
   // Copy constructors
   wxBitmap(); // Platform-specific
 
   // Copy constructors

-  inline wxBitmap(const wxBitmap& bitmap)
+  wxBitmap(const wxBitmap& bitmap)
+      : wxBitmapBase()

   { Ref(bitmap); }
 
   // Initialize with raw data.
   { Ref(bitmap); }
 
   // Initialize with raw data.


@@ -186,8 +189,8 @@ public:
   int GetBitmapType() const;
   
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   int GetBitmapType() const;
   
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }

-  inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
-  inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
+  inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
+  inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }

 
   static void InitStandardHandlers();
 protected:
 
   static void InitStandardHandlers();
 protected: