wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 4d5acb76f72436e41fc31d40349e6134ffa38410..633f2157cd6380189de4f2414f253b5d8ae9c988 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -1,127 +1,150 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 
 #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"
+
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;

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

-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBarGTK;
-class wxBitmapButton;
-class wxStaticBitmap;
-
-class wxMask;
-class wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxMask;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMask)
-
-  public:
-  
-    wxMask(void);
+public:
+    wxMask();

     wxMask( const wxBitmap& bitmap, const wxColour& colour );
     wxMask( const wxBitmap& bitmap, const wxColour& colour );

-    wxMask( const wxBitmap& bitmap, const int paletteIndex );
+#if wxUSE_PALETTE
+    wxMask( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE

     wxMask( const wxBitmap& bitmap );
     wxMask( const wxBitmap& bitmap );

-    ~wxMask(void);
-
-  private:
-  
-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBarGTK;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    
-    GdkBitmap *GetBitmap(void) const;
-    
-  protected:
-  
-    GdkBitmap *m_bitmap;     
-    
+    virtual ~wxMask();
+
+    bool Create( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
+    bool Create( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
+    bool Create( const wxBitmap& bitmap );
+
+    // implementation
+    GdkBitmap   *m_bitmap;
+
+    GdkBitmap *GetBitmap() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-  public:
-
-    wxBitmap(void);
-    wxBitmap( const int width, const int height, const int depth = -1 );
-    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
-    wxBitmap( char **bits );
-    wxBitmap( const wxBitmap& bmp );
-    wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, const int type );
-    ~wxBitmap(void);
-    wxBitmap& operator = ( const wxBitmap& bmp );
-    bool operator == ( const wxBitmap& bmp );
-    bool operator != ( const wxBitmap& bmp );
-    bool Ok(void) const;
-    
-    int GetHeight(void) const;
-    int GetWidth(void) const;
-    int GetDepth(void) const;
-    void SetHeight( const int height );
-    void SetWidth( const int width );
-    void SetDepth( const int depth );
-
-    wxMask *GetMask(void) const;
+public:
+    wxBitmap();
+    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap( const char bits[], int width, int height, int depth = 1 );
+    wxBitmap( const char* const* bits );
+#ifdef wxNEEDS_CHARPP
+    // needed for old GCC
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif
+    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
+    virtual ~wxBitmap();
+
+    bool Create(int width, int height, int depth = -1);
+
+    virtual int GetHeight() const;
+    virtual int GetWidth() const;
+    virtual 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 );
     void SetMask( wxMask *mask );

-    
-    bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, const int type );
-        
-    wxPalette *GetPalette(void) const;
-    wxPalette *GetColourMap(void) const
-      { return GetPalette(); };
-
-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxMemoryDC;
-    friend wxToolBarGTK;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-
-    GdkPixmap *GetPixmap(void) const;
-    GdkBitmap *GetBitmap(void) const;
-    
-    // no data :-)
+
+    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 );
+
+    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;
+
+protected:
+    bool CreateFromImage(const wxImage& image, int depth);
+
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+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)

 };
 
 };
 

+

 #endif // __GTKBITMAPH__
 #endif // __GTKBITMAPH__