Fix part of [ 1570325 ] wxAnimationCtrl for wxAdv library

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 4fa848590a9979c73267b9508dcfb5732053c479..8ad40183ff89c38983bb6ace32dbaaa3daa21bfb 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.h
+// Name:        x11/bitmap.h

 // Purpose:     wxBitmap class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
 // Purpose:     wxBitmap class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 

-#ifdef __GNUG__
-#pragma interface "bitmap.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -26,23 +22,23 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMask;
-class wxBitmap;
-class wxImage;
+class WXDLLIMPEXP_CORE wxMask;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxImage;

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

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

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

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

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


@@ -50,14 +46,14 @@ public:
     // implementation
     WXPixmap GetBitmap() const              { return m_bitmap; }
     void SetBitmap( WXPixmap bitmap )       { m_bitmap = bitmap; }
     // implementation
     WXPixmap GetBitmap() const              { return m_bitmap; }
     void SetBitmap( WXPixmap bitmap )       { m_bitmap = bitmap; }

-    
+

     WXDisplay *GetDisplay() const           { return m_display; }
     void SetDisplay( WXDisplay *display )   { m_display = display; }
     WXDisplay *GetDisplay() const           { return m_display; }
     void SetDisplay( WXDisplay *display )   { m_display = display; }

-    
+

 private:
     WXPixmap    m_bitmap;
     WXDisplay  *m_display;
 private:
     WXPixmap    m_bitmap;
     WXDisplay  *m_display;

-  
+

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


@@ -66,45 +62,59 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmap: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
+{
+    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
+};
+
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase

 {
 public:
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
 {
 public:
     wxBitmap();
     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 wxString &filename, int type = wxBITMAP_TYPE_XPM );
-    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
-    ~wxBitmap();
-    wxBitmap& operator = ( const wxBitmap& bmp );
+    wxBitmap( const char* const* bits );
+    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    virtual ~wxBitmap();
+

     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+    static void InitStandardHandlers();

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

-    
+    bool Create(const void* data, wxBitmapType type,
+                int width, int height, int depth = -1);
+    // create the wxBitmap using a _copy_ of the pixmap
+    bool Create(WXPixmap pixmap);
+

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

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

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

+    bool CreateFromImage(const wxImage& image, int depth = -1);
+#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;
 
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 

-    bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
-    bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
+    bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const;
+    bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM );

 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
         { return GetPalette(); };
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
         { return GetPalette(); };

+    virtual void SetPalette(const wxPalette& palette);

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -117,12 +127,10 @@ public:
 
     WXPixmap GetPixmap() const;
     WXPixmap GetBitmap() const;
 
     WXPixmap GetPixmap() const;
     WXPixmap GetBitmap() const;

-    
+
+    WXPixmap GetDrawable() const;
+

     WXDisplay *GetDisplay() const;
     WXDisplay *GetDisplay() const;

-    
-protected:
-    bool CreateFromXpm(const char **bits);
-    bool CreateFromImage(const wxImage& image, int depth);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)