projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the correct WXDLLEXPORT declaration.
[wxWidgets.git]
/
include
/
wx
/
x11
/
bitmap.h
diff --git
a/include/wx/x11/bitmap.h
b/include/wx/x11/bitmap.h
index 55043f8cb101ef3f039ffd16b35f25be2b3e77a4..c7a746e2e738c023e91730ebc214039065a8e921 100644
(file)
--- a/
include/wx/x11/bitmap.h
+++ b/
include/wx/x11/bitmap.h
@@
-1,18
+1,18
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.h
+// Name:
x11/
bitmap.h
// Purpose: wxBitmap class
// Author: Julian Smart, Robert Roebling
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
// Purpose: wxBitmap class
// Author: Julian Smart, Robert Roebling
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "bitmap.h"
#endif
#pragma interface "bitmap.h"
#endif
@@
-42,7
+42,7
@@
public:
wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap );
~wxMask();
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 );
bool Create( const wxBitmap& bitmap, const wxColour& colour );
bool Create( const wxBitmap& bitmap, int paletteIndex );
bool Create( const wxBitmap& bitmap );
@@
-50,14
+50,14
@@
public:
// implementation
WXPixmap GetBitmap() const { return m_bitmap; }
void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; }
// implementation
WXPixmap GetBitmap() const { return m_bitmap; }
void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; }
-
+
WXDisplay *GetDisplay() const { return m_display; }
void SetDisplay( WXDisplay *display ) { m_display = display; }
WXDisplay *GetDisplay() const { return m_display; }
void SetDisplay( WXDisplay *display ) { m_display = display; }
-
+
private:
WXPixmap m_bitmap;
WXDisplay *m_display;
private:
WXPixmap m_bitmap;
WXDisplay *m_display;
-
+
private:
DECLARE_DYNAMIC_CLASS(wxMask)
};
private:
DECLARE_DYNAMIC_CLASS(wxMask)
};
@@
-66,7
+66,15
@@
private:
// wxBitmap
//-----------------------------------------------------------------------------
// wxBitmap
//-----------------------------------------------------------------------------
-class wxBitmap: public wxGDIObject
+class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase
+{
+public:
+ wxBitmapHandler() : wxBitmapHandlerBase() {}
+private:
+ DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+};
+
+class wxBitmap: public wxBitmapBase
{
public:
wxBitmap();
{
public:
wxBitmap();
@@
-75,36
+83,47
@@
public:
wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxBitmap& bmp );
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 wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
- ~wxBitmap();
+ wxBitmap( const wxString &filename,
wxBitmapType
type = wxBITMAP_TYPE_XPM );
+ virtual ~wxBitmap();
+
wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ) const;
bool operator != ( const wxBitmap& bmp ) const;
bool Ok() const;
wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ) const;
bool operator != ( const wxBitmap& bmp ) const;
bool Ok() const;
+ static void InitStandardHandlers();
+
bool Create(int width, int height, int depth = -1);
bool Create(int width, int height, int depth = -1);
-
+ bool Create(void* data, wxBitmapType type,
+ int width, int height, int depth = -1);
+ // create the wxBitmap using a _copy_ of the pixmap
+ bool Create(WXPixmap pixmap);
+
int GetHeight() const;
int GetWidth() const;
int GetDepth() const;
int GetHeight() const;
int GetWidth() const;
int GetDepth() const;
-
+
+#if wxUSE_IMAGE
+ wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
wxImage ConvertToImage() const;
wxImage ConvertToImage() const;
+ bool CreateFromImage(const wxImage& image, int depth = -1);
+#endif // wxUSE_IMAGE
// 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 );
// 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 );
-
+
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 );
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
{ return GetPalette(); };
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
{ return GetPalette(); };
+ virtual void SetPalette(const wxPalette& palette);
// implementation
// --------------
// implementation
// --------------
@@
-117,12
+136,13
@@
public:
WXPixmap GetPixmap() const;
WXPixmap GetBitmap() const;
WXPixmap GetPixmap() const;
WXPixmap GetBitmap() const;
-
+
+ WXPixmap GetDrawable() const;
+
WXDisplay *GetDisplay() const;
WXDisplay *GetDisplay() const;
-
+
protected:
bool CreateFromXpm(const char **bits);
protected:
bool CreateFromXpm(const char **bits);
- bool CreateFromImage(const wxImage& image, int depth = -1);
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)