refactored wxGTK scrolling: it has now fully-functioning wxScrollHelper and a lot...

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index ee381bac8db8e653d65a997cfd7437d9624f057e..d33ce22cc1410b7395e6b37b007037fb7faff1f6 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -11,102 +11,178 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
 #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;
+#endif
+
+class WXDLLEXPORT wxPixelDataBase;

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

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

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// also implemented here from wxImage
+// wxMask

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-/*
-class wxImage : wxGDIObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject

 {
 {

-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
+public:
+    wxMask();
+    wxMask( const wxBitmap& bitmap, const wxColour& colour );
+    wxMask( const wxBitmap& bitmap, int paletteIndex );
+    wxMask( const wxBitmap& bitmap );
+    ~wxMask();
+  
+    bool Create( const wxBitmap& bitmap, const wxColour& colour );
+    bool Create( const wxBitmap& bitmap, int paletteIndex );
+    bool Create( const wxBitmap& bitmap );
+
+    // implementation
+    GdkBitmap   *m_bitmap;
+    
+    GdkBitmap *GetBitmap() const;
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)
+};

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxMask
+// wxBitmap

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMask)
-

 public:
 public:

-  wxMask();
-  wxMask( const wxBitmap& bitmap, const wxColour& colour );
-  wxMask( const wxBitmap& bitmap, int paletteIndex );
-  wxMask( const wxBitmap& bitmap );
-  ~wxMask();
+    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, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    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;
+
+    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
+    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,
+                          const wxPalette *palette = (wxPalette *)NULL) const;
+    bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM );
+
+#if wxUSE_PALETTE
+    wxPalette *GetPalette() const;
+    void SetPalette(const wxPalette& palette);
+    wxPalette *GetColourMap() const { return GetPalette(); };
+#endif // wxUSE_PALETTE
+
+    static void InitStandardHandlers();
+
+    // implementation
+    // --------------
+
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
+    void SetPixmap( GdkPixmap *pixmap );
+    void SetBitmap( GdkBitmap *bitmap );
+#ifdef __WXGTK20__
+    void SetPixbuf(GdkPixbuf *pixbuf);
+#endif

 
 

- // implementation
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+    bool HasPixmap() const;
+#ifdef __WXGTK20__
+    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);
+
+private:
+    // to be called from CreateFromImage only!
+    bool CreateFromImageAsBitmap(const wxImage& image);
+    bool CreateFromImageAsPixmap(const wxImage& image);
+
+#ifdef __WXGTK20__
+    bool CreateFromImageAsPixbuf(const wxImage& image);
+
+    enum Representation
+    {
+        Pixmap,
+        Pixbuf
+    };
+    // removes other representations from memory, keeping only 'keep'
+    // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
+    void PurgeOtherRepresentations(Representation keep);
+
+    friend class wxMemoryDC;
+#endif
+    friend class wxBitmapHandler;

 
 

-  GdkBitmap   *m_bitmap;
-  GdkBitmap *GetBitmap() const;
+private:    
+    DECLARE_DYNAMIC_CLASS(wxBitmap)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxBitmap
+// wxBitmapHandler

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-

 public:
 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 );
-  wxBitmap( char **bits );
-  wxBitmap( const wxBitmap& bmp );
-  wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
-  ~wxBitmap();
-  wxBitmap& operator = ( const wxBitmap& bmp );
-  bool operator == ( const wxBitmap& bmp );
-  bool operator != ( const wxBitmap& bmp );
-  bool Ok() const;
-
-  int GetHeight() const;
-  int GetWidth() const;
-  int GetDepth() const;
-
-  wxMask *GetMask() const;
-  void SetMask( wxMask *mask );
-
-  bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
-  bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
-
-  wxPalette *GetPalette() const;
-  wxPalette *GetColourMap() const
-    { return GetPalette(); };
-
-// implementation
-
-  void SetHeight( int height );
-  void SetWidth( int width );
-  void SetDepth( int depth );
-  void SetPixmap( GdkPixmap *pixmap );
-
-  GdkPixmap *GetPixmap() const;
-  GdkBitmap *GetBitmap() const;
-
-    // no data :-)
+    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)

 };
 
 };
 

+

 #endif // __GTKBITMAPH__
 #endif // __GTKBITMAPH__