projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ifdef - its libpng not pnglib :)
[wxWidgets.git]
/
include
/
wx
/
bitmap.h
diff --git
a/include/wx/bitmap.h
b/include/wx/bitmap.h
index 4a1d3b0296a4c8a3891e29266fc87c27dd66cf0e..8c34a26f7e8d03f5a95c892850499dab44648f3c 100644
(file)
--- a/
include/wx/bitmap.h
+++ b/
include/wx/bitmap.h
@@
-5,7
+5,7
@@
// Modified by:
// Created: 22.04.01
// RCS-ID: $Id$
// Modified by:
// Created: 22.04.01
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
+// Copyright: (c) wxWi
dget
s team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-16,7
+16,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "bitmapbase.h"
#endif
#pragma interface "bitmapbase.h"
#endif
@@
-32,6
+32,14
@@
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
+#if defined(__WXMGL__) || \
+ defined(__WXMAC__) || \
+ defined(__WXCOCOA__) || \
+ defined(__WXMOTIF__) || \
+ defined(__WXX11__)
+// Only used by some ports
+// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
+
// ----------------------------------------------------------------------------
// wxBitmapHandler: class which knows how to create/load/save bitmaps in
// different formats
// ----------------------------------------------------------------------------
// wxBitmapHandler: class which knows how to create/load/save bitmaps in
// different formats
@@
-41,9
+49,10
@@
class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
{
public:
wxBitmapHandlerBase()
{
public:
wxBitmapHandlerBase()
- {
- m_type = wxBITMAP_TYPE_INVALID;
- }
+ : m_name()
+ , m_extension()
+ , m_type(wxBITMAP_TYPE_INVALID)
+ { }
virtual ~wxBitmapHandlerBase() { }
virtual ~wxBitmapHandlerBase() { }
@@
-69,8
+78,6
@@
protected:
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
};
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
};
-
-
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
{
public:
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
{
public:
@@
-114,13
+121,18
@@
public:
const wxPalette *palette = (wxPalette *)NULL) const = 0;
virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0;
const wxPalette *palette = (wxPalette *)NULL) const = 0;
virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0;
+ /*
+ If raw bitmap access is supported (see wx/rawbmp.h), the following
+ methods should be implemented:
+
+ virtual bool GetRawData(wxRawBitmapData *data) = 0;
+ virtual void UngetRawData(wxRawBitmapData *data) = 0;
+ */
+
+#if wxUSE_PALETTE
virtual wxPalette *GetPalette() const = 0;
virtual void SetPalette(const wxPalette& palette) = 0;
virtual wxPalette *GetPalette() const = 0;
virtual void SetPalette(const wxPalette& palette) = 0;
-
-#if WXWIN_COMPATIBILITY
- wxPalette *GetColourMap() const { return GetPalette(); }
- void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
-#endif // WXWIN_COMPATIBILITY
+#endif // wxUSE_PALETTE
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon) = 0;
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon) = 0;
@@
-149,25
+161,24
@@
protected:
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
};
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
};
-
-
+#endif
#if defined(__WXMSW__)
#include "wx/msw/bitmap.h"
#elif defined(__WXMOTIF__)
#if defined(__WXMSW__)
#include "wx/msw/bitmap.h"
#elif defined(__WXMOTIF__)
-#include "wx/
motif
/bitmap.h"
+#include "wx/
x11
/bitmap.h"
#elif defined(__WXGTK__)
#include "wx/gtk/bitmap.h"
#elif defined(__WXGTK__)
#include "wx/gtk/bitmap.h"
+#elif defined(__WXX11__)
+#include "wx/x11/bitmap.h"
#elif defined(__WXMGL__)
#include "wx/mgl/bitmap.h"
#elif defined(__WXMGL__)
#include "wx/mgl/bitmap.h"
-#elif defined(__WXQT__)
-#include "wx/qt/bitmap.h"
#elif defined(__WXMAC__)
#include "wx/mac/bitmap.h"
#elif defined(__WXMAC__)
#include "wx/mac/bitmap.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/bitmap.h"
#elif defined(__WXPM__)
#include "wx/os2/bitmap.h"
#elif defined(__WXPM__)
#include "wx/os2/bitmap.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/bitmap.h"
#endif
#endif
#endif
#endif