added adjustOrigin parameter to bounds calculation

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 81406d49ecee9a1fcea68de40ef9f45a0a424282..51cc2fed09c8aa4141cead85bf6e597fb662a73f 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,9 +2,8 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,7 +11,7 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"

+#include "wx/gdiobj.h"

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


@@ -27,6 +27,7 @@
 
 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;

+class wxImage;

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


@@ -34,81 +35,92 @@ class wxBitmap;
 
 class wxMask: public wxObject
 {
 
 class wxMask: public wxObject
 {

-  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();
     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
+    // implementation
+    GdkBitmap   *m_bitmap;

     
     GdkBitmap *GetBitmap() const;
     
     GdkBitmap *GetBitmap() const;

-
-  protected:

   
   

-    friend wxBitmap;
-
-    GdkBitmap *m_bitmap;
-
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)

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

-// CMB 20/5/98: added xbm constructor and GetBitmap() method
-class wxBitmap: public wxObject
+class wxBitmap: public wxGDIObject

 {
 {

-  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();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );

-    wxBitmap( char **bits );
+    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }

     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap& bmp );

-    wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM);
+    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();
     wxBitmap& operator = ( const wxBitmap& bmp );

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

     bool Ok() 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;

-    void SetHeight( int height );
-    void SetWidth( int width );
-    void SetDepth( int depth );
+    
+    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 );

-
-    void Resize( int height, int width );
+    
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;

 
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
 
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );

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

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

-    wxPalette *GetColourMap() const
-      { return GetPalette(); };
-      
-  // implementation      
+    wxPalette *GetColourMap() const { return GetPalette(); };

 
 

-    GdkPixmap *GetPixmap() const;
-    GdkBitmap *GetBitmap() const;
+    static void InitStandardHandlers() { }
+    static void CleanUpHandlers() { }
+
+    // implementation
+    // --------------

 
 

-    void DestroyImage();
-    void RecreateImage();
-    void Render();
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );
+    void SetPixmap( GdkPixmap *pixmap );
+    void SetBitmap( GdkBitmap *bitmap );

 
 

-    // no data :-)
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+    
+    // Basically, this corresponds to Win32 StretchBlt()
+    wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
+protected:
+    bool CreateFromXpm(const char **bits);
+    bool CreateFromImage(const wxImage& image, int depth);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmap)

 };
 
 #endif // __GTKBITMAPH__
 };
 
 #endif // __GTKBITMAPH__