Fix scrolling bug where client size was reported wrong

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 5096d3b8b56a3e430260c6a33b464b118b6949d9..21dc2c07d2221a6093407135aca331818ff6a025 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.h
+// Name:        wx/gtk1/bitmap.h

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -11,45 +11,48 @@
 #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/gdiobj.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 

+class WXDLLEXPORT wxPixelDataBase;
+

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

-class wxMask;
-class wxBitmap;
+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 );
 {
 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)
 };


@@ -58,7 +61,7 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxBitmap();
 {
 public:
     wxBitmap();


@@ -66,31 +69,40 @@ public:
     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 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();
-    wxBitmap& operator = ( const wxBitmap& bmp );
-    bool operator == ( const wxBitmap& bmp );
-    bool operator != ( const wxBitmap& bmp );
+    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
+    virtual ~wxBitmap();
+    bool operator == ( const wxBitmap& bmp ) const;
+    bool operator != ( const wxBitmap& bmp ) const;

     bool Ok() const;
 
     bool Create(int width, int height, int depth = -1);
     bool Ok() const;
 
     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;
 

+    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 );
     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 );

 
 

+#if wxUSE_PALETTE

     wxPalette *GetPalette() const;
     wxPalette *GetPalette() const;

-    wxPalette *GetColourMap() const
-    { return GetPalette(); };
+    void SetPalette(const wxPalette& palette);
+    wxPalette *GetColourMap() const { return GetPalette(); };
+#endif // wxUSE_PALETTE
+
+    static void InitStandardHandlers();

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


@@ -103,12 +115,51 @@ public:
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-    
+    bool HasPixmap() const;
+
+    // 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);
 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);
+
+    friend class wxBitmapHandler;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+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)
+};
+
+

 #endif // __GTKBITMAPH__
 #endif // __GTKBITMAPH__