X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f383c5b89cba1a3bfcc53d9d52c523085a6156db..2ad75f457d171a8342b39a7676112f3ff55894f5:/include/wx/gtk/bitmap.h?ds=sidebyside

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 2c8c37975a..0e74b7a631 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.h
+// Name:        wx/gtk/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -11,10 +11,6 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -31,32 +27,36 @@ class WXDLLEXPORT wxPixelDataBase;
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMask;
-class wxBitmap;
-class wxImage;
+class WXDLLIMPEXP_CORE wxMask;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxImage;
 
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 
-class wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
 public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
-  
+
     bool Create( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap );
 
     // implementation
     GdkBitmap   *m_bitmap;
-    
+
     GdkBitmap *GetBitmap() const;
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
@@ -65,7 +65,7 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-class wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
     wxBitmap();
@@ -83,11 +83,11 @@ public:
     bool Ok() const;
 
     bool Create(int width, int height, int depth = -1);
-    
+
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;
-    
+
     wxImage ConvertToImage() const;
 
     // copies the contents and mask of the given (colour) icon to the bitmap
@@ -95,7 +95,7 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
-    
+
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
@@ -129,14 +129,17 @@ public:
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
 #endif
-    
+
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
-    
+
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
 
+    bool HasAlpha() const;
+    void UseAlpha();
+
 protected:
     bool CreateFromXpm(const char **bits);
     bool CreateFromImage(const wxImage& image, int depth);
@@ -162,7 +165,7 @@ private:
 #endif
     friend class wxBitmapHandler;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
@@ -170,7 +173,7 @@ private:
 // wxBitmapHandler
 //-----------------------------------------------------------------------------
 
-class wxBitmapHandler: public wxBitmapHandlerBase
+class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
 {
 public:
     wxBitmapHandler() { }