Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added

Browse Source 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 17:54:20 +00:00
parent d6906a06a2
commit 8f884a0dcc
161 changed files with 1244 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mgl/bitmap.h
View File

@@ -38,8 +38,6 @@ public:
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
wxBitmap(const wxImage& image, int depth = -1);
virtual ~wxBitmap() {}
bool Ok() const { return IsOk(); }
bool IsOk() const;
bool Create(int width, int height, int depth = -1);

15
include/wx/mgl/brush.h
View File

@@ -27,17 +27,15 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
// wxBrush
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxBrush: public wxBrushBase
class WXDLLEXPORT wxBrush : public wxBrushBase
{
public:
wxBrush() {}
wxBrush(const wxColour &colour, int style = wxSOLID);
wxBrush(const wxBitmap &stippleBitmap);
virtual ~wxBrush() {}
bool operator == (const wxBrush& brush) const;
bool operator != (const wxBrush& brush) const;
bool Ok() const { return IsOk(); }
bool IsOk() const;
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const;
virtual int GetStyle() const;
wxColour &GetColour() const;
@@ -54,9 +52,8 @@ public:
void* GetPixPattern() const;
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxBrush)

7
include/wx/mgl/cursor.h
View File

@@ -10,8 +10,7 @@
#ifndef __WX_CURSOR_H__
#define __WX_CURSOR_H__
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
class MGLCursor;
@@ -20,7 +19,7 @@ class MGLCursor;
// wxCursor
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxCursor: public wxObject
class WXDLLEXPORT wxCursor : public wxGDIObject
{
public:
@@ -33,8 +32,6 @@ public:
long flags = wxBITMAP_TYPE_CUR_RESOURCE,
int hotSpotX = 0, int hotSpotY = 0);
virtual ~wxCursor();
bool Ok() const { return IsOk(); }
bool IsOk() const;
// implementation
MGLCursor *GetMGLCursor() const;

4
include/wx/mgl/font.h
View File

@@ -87,8 +87,8 @@ public:
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxFont)

8
include/wx/mgl/palette.h
View File

@@ -27,16 +27,12 @@ struct palette_t;
// wxPalette
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPalette: public wxPaletteBase
class WXDLLEXPORT wxPalette : public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette();
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
virtual ~wxPalette();
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
@@ -46,6 +42,8 @@ public:
virtual int GetColoursCount() const;
palette_t *GetMGLpalette_t() const;
DECLARE_DYNAMIC_CLASS(wxPalette)
};
#endif // __WX_PALETTE_H__

10
include/wx/mgl/pen.h
View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxPen;
// wxPen
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPen: public wxGDIObject
class WXDLLEXPORT wxPen : public wxGDIObject
{
public:
wxPen() {}
@@ -56,16 +56,12 @@ public:
wxDash* GetDash() const;
wxBitmap *GetStipple() const;
bool Ok() const { return IsOk(); }
bool IsOk() const;
// implementation:
void* GetPixPattern() const;
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxPen)

5
include/wx/mgl/region.h
View File

@@ -44,9 +44,8 @@ public:
const MGLRegion& GetMGLRegion() const;
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
// wxRegionBase pure virtuals
virtual bool DoIsEqual(const wxRegion& region) const;