fix saving/restoring size when WM supports _NET_FRAME_EXTENTS but not _NET_REQUEST_FR...

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 0e74b7a631e1ea3ef8aa2a4ef70988d049bb80fd..c1eee5ca50c06f141538c3402b4477605a6e8f05 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -7,29 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_BITMAP_H_
+#define _WX_GTK_BITMAP_H_

 
 

-#ifndef __GTKBITMAPH__
-#define __GTKBITMAPH__
-
-#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 WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;

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


@@ -44,7 +26,7 @@ public:
     wxMask( const wxBitmap& bitmap, int paletteIndex );
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     wxMask( const wxBitmap& bitmap, int paletteIndex );
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );

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

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


@@ -68,27 +50,31 @@ private:
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:

-    wxBitmap();
-    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap() { }
+    wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH );

     wxBitmap( const char bits[], 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;
+    wxBitmap( const char* const* bits );
+#ifdef wxNEEDS_CHARPP
+    // needed for old GCC
+    wxBitmap(char** data)
+    { *this = wxBitmap(const_cast<const char* const*>(data)); }
+#endif
+    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
+#if wxUSE_IMAGE
+    wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH )
+        { (void)CreateFromImage(image, depth); }
+#endif // wxUSE_IMAGE
+    virtual ~wxBitmap();
+
+    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);

 
 

+    virtual int GetHeight() const;
+    virtual int GetWidth() const;
+    virtual 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);
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);


@@ -100,7 +86,7 @@ public:
 
     bool SaveFile(const wxString &name, wxBitmapType type,
                           const wxPalette *palette = (wxPalette *)NULL) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
                           const wxPalette *palette = (wxPalette *)NULL) const;

-    bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

 
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
 
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;


@@ -117,41 +103,40 @@ 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);
 
     bool HasAlpha() const;
 
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
 
     bool HasAlpha() const;

-    void UseAlpha();

 
 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 wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* 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,32 +146,8 @@ 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:
     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 // _WX_GTK_BITMAP_H_