projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
bitmap.h
diff --git
a/include/wx/cocoa/bitmap.h
b/include/wx/cocoa/bitmap.h
index e8693703e139d4d7b657dca8d7dfc57ab65d6340..e1f3e681c496517a4063ee9328849f24ea7c670d 100644
(file)
--- a/
include/wx/cocoa/bitmap.h
+++ b/
include/wx/cocoa/bitmap.h
@@
-26,7
+26,7
@@
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// ========================================================================
// A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently.
// ========================================================================
// A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently.
-class WXDLL
EXPORT
wxMask: public wxObject
+class WXDLL
IMPEXP_CORE
wxMask: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxMask)
public:
{
DECLARE_DYNAMIC_CLASS(wxMask)
public:
@@
-62,9
+62,8
@@
protected:
// ========================================================================
// wxBitmap
// ========================================================================
// ========================================================================
// wxBitmap
// ========================================================================
-class WXDLL
EXPORT
wxBitmap: public wxGDIObject
+class WXDLL
IMPEXP_CORE
wxBitmap: public wxGDIObject
{
{
- DECLARE_DYNAMIC_CLASS(wxBitmap)
// ------------------------------------------------------------------------
// initialization
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// initialization
// ------------------------------------------------------------------------
@@
-76,7
+75,7
@@
public:
// Initialize with XPM data
wxBitmap(const char* const* bits);
// Load a file or resource
// Initialize with XPM data
wxBitmap(const char* const* bits);
// Load a file or resource
- wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_
TYPE_BMP_RESOURC
E);
+ wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_
DEFAULT_TYP
E);
// Construct from Cocoa's NSImage
wxBitmap(NSImage* cocoaNSImage);
// Construct from Cocoa's NSBitmapImageRep
// Construct from Cocoa's NSImage
wxBitmap(NSImage* cocoaNSImage);
// Construct from Cocoa's NSBitmapImageRep
@@
-102,10
+101,10
@@
public:
bool CreateFromImage(const wxImage& image, int depth=-1);
virtual bool Create(int width, int height, int depth = -1);
bool CreateFromImage(const wxImage& image, int depth=-1);
virtual bool Create(int width, int height, int depth = -1);
-
virtual
bool Create(NSImage* cocoaNSImage);
-
virtual
bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep);
+ bool Create(NSImage* cocoaNSImage);
+ bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep);
virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
- virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_
TYPE_BMP_RESOURC
E);
+ virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_
DEFAULT_TYP
E);
virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
// copies the contents and mask of the given (colour) icon to the bitmap
@@
-116,8
+115,6
@@
public:
// get the given part of bitmap
wxBitmap GetSubBitmap( const wxRect& rect ) const;
// get the given part of bitmap
wxBitmap GetSubBitmap( const wxRect& rect ) const;
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
int GetWidth() const;
int GetHeight() const;
int GetDepth() const;
int GetWidth() const;
int GetHeight() const;
int GetDepth() const;
@@
-138,11
+135,7
@@
public:
wxMask *GetMask() const;
void SetMask(wxMask *mask) ;
wxMask *GetMask() const;
void SetMask(wxMask *mask) ;
- int GetBitmapType() const;
-
- // wxObjectRefData
- wxObjectRefData *CreateRefData() const;
- wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+ wxBitmapType GetBitmapType() const;
// wxCocoa
WX_NSBitmapImageRep GetNSBitmapImageRep();
// wxCocoa
WX_NSBitmapImageRep GetNSBitmapImageRep();
@@
-151,12
+144,13
@@
public:
static void InitStandardHandlers() { }
static void CleanUpHandlers() { }
static void InitStandardHandlers() { }
static void CleanUpHandlers() { }
-};
-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
+protected:
+ wxGDIRefData *CreateGDIRefData() const;
+ wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+ DECLARE_DYNAMIC_CLASS(wxBitmap)
};
};
-#endif
-
// __WX_COCOA_BITMAP_H__
+
+
#endif
// __WX_COCOA_BITMAP_H__