Added CmdDown() to grid events

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 51cc2fed09c8aa4141cead85bf6e597fb662a73f..29649632b977dbc565be4880b67074f01141d2b4 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$


@@ -11,46 +11,50 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
 #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"
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 

+typedef struct _GdkPixbuf GdkPixbuf;
+
+class WXDLLEXPORT wxPixelDataBase;
+

 //-----------------------------------------------------------------------------
 // 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 );
 {
 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();
     wxMask( const wxBitmap& bitmap );
     ~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)
 };


@@ -59,7 +63,7 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

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

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


@@ -67,21 +71,19 @@ 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( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );

     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     ~wxBitmap();
     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);
     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;
     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
     wxImage ConvertToImage() const;
 
     // copies the contents and mask of the given (colour) icon to the bitmap


@@ -89,17 +91,20 @@ public:
 
     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;

+    void SetPalette(const wxPalette& palette);

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

+#endif // wxUSE_PALETTE

 
 

-    static void InitStandardHandlers() { }
-    static void CleanUpHandlers() { }
+    static void InitStandardHandlers();

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


@@ -109,18 +114,69 @@ public:
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetBitmap( GdkBitmap *bitmap );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetBitmap( GdkBitmap *bitmap );

+    void SetPixbuf(GdkPixbuf *pixbuf);

 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-    
+    bool HasPixmap() const;
+    bool HasPixbuf() const;
+    GdkPixbuf *GetPixbuf() const;
+

     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
     // 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);
 
 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);
+
+    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;
+    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__