removed GDI lists from wxMGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,7 +75,7 @@ private:
|
|||||||
class WXDLLEXPORT wxBitmap: public wxBitmapBase
|
class WXDLLEXPORT wxBitmap: public wxBitmapBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxBitmap();
|
wxBitmap() {}
|
||||||
wxBitmap(int width, int height, int depth = -1);
|
wxBitmap(int width, int height, int depth = -1);
|
||||||
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
||||||
wxBitmap(const char **bits) { CreateFromXpm(bits); }
|
wxBitmap(const char **bits) { CreateFromXpm(bits); }
|
||||||
@@ -83,7 +83,7 @@ public:
|
|||||||
wxBitmap(const wxBitmap& bmp);
|
wxBitmap(const wxBitmap& bmp);
|
||||||
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
|
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
|
||||||
wxBitmap(const wxImage& image, int depth = -1);
|
wxBitmap(const wxImage& image, int depth = -1);
|
||||||
~wxBitmap();
|
~wxBitmap() {}
|
||||||
wxBitmap& operator = (const wxBitmap& bmp);
|
wxBitmap& operator = (const wxBitmap& bmp);
|
||||||
bool operator == (const wxBitmap& bmp) const;
|
bool operator == (const wxBitmap& bmp) const;
|
||||||
bool operator != (const wxBitmap& bmp) const;
|
bool operator != (const wxBitmap& bmp) const;
|
||||||
|
@@ -35,11 +35,11 @@ class WXDLLEXPORT wxBrush;
|
|||||||
class WXDLLEXPORT wxBrush: public wxGDIObject
|
class WXDLLEXPORT wxBrush: public wxGDIObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxBrush();
|
wxBrush() {}
|
||||||
wxBrush(const wxColour &colour, int style);
|
wxBrush(const wxColour &colour, int style);
|
||||||
wxBrush(const wxBitmap &stippleBitmap);
|
wxBrush(const wxBitmap &stippleBitmap);
|
||||||
wxBrush(const wxBrush &brush);
|
wxBrush(const wxBrush &brush);
|
||||||
~wxBrush();
|
~wxBrush() {}
|
||||||
wxBrush& operator = (const wxBrush& brush);
|
wxBrush& operator = (const wxBrush& brush);
|
||||||
bool operator == (const wxBrush& brush) const;
|
bool operator == (const wxBrush& brush) const;
|
||||||
bool operator != (const wxBrush& brush) const;
|
bool operator != (const wxBrush& brush) const;
|
||||||
|
@@ -67,7 +67,7 @@ public:
|
|||||||
|
|
||||||
bool Create(const wxNativeFontInfo& fontinfo);
|
bool Create(const wxNativeFontInfo& fontinfo);
|
||||||
|
|
||||||
~wxFont();
|
~wxFont() {}
|
||||||
|
|
||||||
// assignment
|
// assignment
|
||||||
wxFont& operator=(const wxFont& font);
|
wxFont& operator=(const wxFont& font);
|
||||||
@@ -98,7 +98,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
void Init();
|
void Init() {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||||
|
@@ -35,11 +35,11 @@ class WXDLLEXPORT wxPen;
|
|||||||
class WXDLLEXPORT wxPen: public wxGDIObject
|
class WXDLLEXPORT wxPen: public wxGDIObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxPen();
|
wxPen() {}
|
||||||
wxPen(const wxColour &colour, int width, int style);
|
wxPen(const wxColour &colour, int width, int style);
|
||||||
wxPen(const wxBitmap& stipple, int width);
|
wxPen(const wxBitmap& stipple, int width);
|
||||||
wxPen(const wxPen& pen);
|
wxPen(const wxPen& pen);
|
||||||
~wxPen();
|
~wxPen() {}
|
||||||
wxPen& operator = (const wxPen& pen);
|
wxPen& operator = (const wxPen& pen);
|
||||||
bool operator == (const wxPen& pen) const;
|
bool operator == (const wxPen& pen) const;
|
||||||
bool operator != (const wxPen& pen) const;
|
bool operator != (const wxPen& pen) const;
|
||||||
|
Reference in New Issue
Block a user