projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made some wxHtmlEntitiesParser's methods public -- turned out they are useful
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
bitmap.h
diff --git
a/include/wx/gtk1/bitmap.h
b/include/wx/gtk1/bitmap.h
index dcf1d232689bcf7f58fab43e23f27de735d12f3b..a6c24d9c068a3d80e4270889f45e23017f411f04 100644
(file)
--- a/
include/wx/gtk1/bitmap.h
+++ b/
include/wx/gtk1/bitmap.h
@@
-2,10
+2,9
@@
// 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
-// Licence: wxWindows licence
+// Copyright: (c) 1998 Robert Roebling
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-20,23
+19,15
@@
#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
//-----------------------------------------------------------------------------
-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-class wxFrame;
-class wxDialog;
-class wxTreeCtrl;
-
class wxMask;
class wxBitmap;
class wxMask;
class wxBitmap;
+class wxImage;
//-----------------------------------------------------------------------------
// wxMask
//-----------------------------------------------------------------------------
// wxMask
@@
-44,99
+35,85
@@
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 );
- private:
-
- friend wxBitmap;
- friend wxDC;
- friend wxPaintDC;
- friend wxToolBar;
- friend wxBitmapButton;
- friend wxStaticBitmap;
- friend wxFrame;
- friend wxDialog;
- friend wxTreeCtrl;
-
+ // implementation
+ GdkBitmap *m_bitmap;
+
GdkBitmap *GetBitmap() const;
GdkBitmap *GetBitmap() const;
-
- protected:
-
- 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 wx
Bitmap* bmp
);
- wxBitmap( const wx
String &filename, int type = wxBITMAP_TYPE_XPM);
+ wxBitmap( const wx
String &filename, int type = wxBITMAP_TYPE_XPM
);
+ wxBitmap( const wx
Image& 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;
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 *GetColourMap() const
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
-
{ return GetPalette(); };
+ { return GetPalette(); };
- private:
+ // implementation
+ // --------------
- friend wxDC;
- friend wxPaintDC;
- friend wxMemoryDC;
- friend wxToolBar;
- friend wxBitmapButton;
- friend wxStaticBitmap;
- friend wxFrame;
- friend wxDialog;
- friend wxTreeCtrl;
+ 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;
GdkPixmap *GetPixmap() const;
GdkBitmap *GetBitmap() const;
-
- void DestroyImage();
-
void RecreateImage(
);
-
void Render(
);
+
+protected:
+
bool CreateFromXpm(const char **bits
);
+
bool CreateFromImage(const wxImage& image, int depth
);
- // no data :-)
+private:
+ DECLARE_DYNAMIC_CLASS(wxBitmap)
};
#endif // __GTKBITMAPH__
};
#endif // __GTKBITMAPH__