check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 3dccd3668fd17d6f9ce372419761db1754767701..98bc4a8beea942192afda6193e56a176f3049182 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,56 +7,38 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_BITMAP_H_
+#define _WX_GTK_BITMAP_H_

 
 

-#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"
-#include "wx/palette.h"
-#include "wx/gdiobj.h"
-
-#ifdef __WXGTK20__

 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkPixbuf GdkPixbuf;

-#endif
-
-class WXDLLEXPORT wxPixelDataBase;
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMask;
-class wxBitmap;
-class wxImage;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;

 
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 

-class wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject

 {
 public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
 {
 public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );

+#if wxUSE_PALETTE

     wxMask( const wxBitmap& bitmap, int paletteIndex );
     wxMask( const wxBitmap& bitmap, int paletteIndex );

+#endif // wxUSE_PALETTE

     wxMask( const wxBitmap& bitmap );
     wxMask( const wxBitmap& bitmap );

-    ~wxMask();
-  
+    virtual ~wxMask();
+

     bool Create( const wxBitmap& bitmap, const wxColour& colour );
     bool Create( const wxBitmap& bitmap, const wxColour& colour );

+#if wxUSE_PALETTE

     bool Create( const wxBitmap& bitmap, int paletteIndex );
     bool Create( const wxBitmap& bitmap, int paletteIndex );

+#endif // wxUSE_PALETTE

     bool Create( const wxBitmap& bitmap );
 
     // implementation
     GdkBitmap   *m_bitmap;
     bool Create( const wxBitmap& bitmap );
 
     // implementation
     GdkBitmap   *m_bitmap;

-    
+

     GdkBitmap *GetBitmap() const;
     GdkBitmap *GetBitmap() const;

-  
+

 private:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };


@@ -65,37 +47,44 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase

 {
 public:
 {
 public:

-    wxBitmap();
+    wxBitmap() { }

     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );

-    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
-    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
-    wxBitmap( const wxBitmap& bmp );
+    wxBitmap( const char* const* bits );
+#ifdef wxNEEDS_CHARPP
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif

     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );

+#if wxUSE_IMAGE

     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }

-    ~wxBitmap();
-    wxBitmap& operator = ( const wxBitmap& bmp );
-    bool operator == ( const wxBitmap& bmp ) const;
-    bool operator != ( const wxBitmap& bmp ) const;
-    bool Ok() const;
+#endif // wxUSE_IMAGE
+    virtual ~wxBitmap();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
     bool Create(int width, int height, int depth = -1);

-    
+

     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;

-    
+
+#if wxUSE_IMAGE

     wxImage ConvertToImage() const;
     wxImage ConvertToImage() const;

+#endif // wxUSE_IMAGE

 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );

-    
+

     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,


@@ -117,41 +106,39 @@ public:
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );

-    void SetBitmap( GdkBitmap *bitmap );
-#ifdef __WXGTK20__
-    void SetPixbuf(GdkPixbuf *pixbuf);
-#endif
+    void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0);

 
     GdkPixmap *GetPixmap() const;
 
     GdkPixmap *GetPixmap() const;

-    GdkBitmap *GetBitmap() const;

     bool HasPixmap() const;
     bool HasPixmap() const;

-#ifdef __WXGTK20__

     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;

-#endif
-    
+

     // Basically, this corresponds to Win32 StretchBlt()
     // Basically, this corresponds to Win32 StretchBlt()

-    wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
-    
+    wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight, int width, int height) const;
+

     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
 
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
 

-    bool HasAlpha() const { return true; }
-    void UseAlpha() { }
+    bool HasAlpha() const;

 
 protected:
 
 protected:

-    bool CreateFromXpm(const char **bits);
+#if wxUSE_IMAGE

     bool CreateFromImage(const wxImage& image, int depth);
     bool CreateFromImage(const wxImage& image, int depth);

+#endif // wxUSE_IMAGE
+
+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;

 
 private:
 
 private:

+#if wxUSE_IMAGE

     // to be called from CreateFromImage only!
     // to be called from CreateFromImage only!

-    bool CreateFromImageAsBitmap(const wxImage& image);
-    bool CreateFromImageAsPixmap(const wxImage& image);
-
-#ifdef __WXGTK20__
+    bool CreateFromImageAsPixmap(const wxImage& image, int depth);

     bool CreateFromImageAsPixbuf(const wxImage& image);
     bool CreateFromImageAsPixbuf(const wxImage& image);

+#endif // wxUSE_IMAGE

 
 

+public:
+    // implementation only

     enum Representation
     {
         Pixmap,
     enum Representation
     {
         Pixmap,


@@ -161,11 +148,7 @@ private:
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
 
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
 

-    friend class wxMemoryDC;
-#endif
-    friend class wxBitmapHandler;
-
-private:    
+private:

     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 


@@ -173,20 +156,9 @@ private:
 // wxBitmapHandler
 //-----------------------------------------------------------------------------
 
 // wxBitmapHandler
 //-----------------------------------------------------------------------------
 

-class wxBitmapHandler: public wxBitmapHandlerBase
+class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase

 {
 {

-public:
-    wxBitmapHandler() { }
-    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);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)

 };
 
 };
 

-
-#endif // __GTKBITMAPH__
+#endif // _WX_GTK_BITMAP_H_