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/motif/colour.h
View File

@@ -36,7 +36,7 @@ public:
// accessors
bool IsOk() const {return m_isInit; }
virtual bool IsOk() const {return m_isInit; }
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; }

16
include/wx/motif/cursor.h
View File

@@ -12,16 +12,14 @@
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
#include "wx/object.h"
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
class WXDLLIMPEXP_FWD_CORE wxImage;
// Cursor
class WXDLLEXPORT wxCursor: public wxObject
class WXDLLEXPORT wxCursor : public wxGDIObject
{
DECLARE_DYNAMIC_CLASS(wxCursor)
public:
wxCursor();
@@ -39,12 +37,14 @@ public:
wxCursor(wxStockCursor id);
virtual ~wxCursor();
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
// Motif-specific.
// Create/get a cursor for the current display
WXCursor GetXCursor(WXDisplay* display) const;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
void Create(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
@@ -53,6 +53,8 @@ private:
// Make a cursor from standard id
WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
DECLARE_DYNAMIC_CLASS(wxCursor)
};
extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);

7
include/wx/motif/font.h
View File

@@ -107,7 +107,11 @@ public:
// like the function above but does a copy for XmFontList
WXFontType GetFontTypeC(WXDisplay* display) const;
static WXString GetFontTag();
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
void Unshare();
@@ -116,5 +120,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxFont)
};
#endif
// _WX_FONT_H_
#endif // _WX_FONT_H_