X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb50e4b4677abb67ffe9026780861c1b12a0463..a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index d726d44c1e..f0719dbe00 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -25,6 +25,7 @@ // Standard cursors typedef enum { + wxCURSOR_NONE = 0, wxCURSOR_ARROW = 1, wxCURSOR_BULLSEYE, wxCURSOR_CHAR, @@ -57,7 +58,7 @@ typedef enum { wxCURSOR_BASED_ARROW_UP, wxCURSOR_BASED_ARROW_DOWN #endif -} _standard_cursors_t; +} wxStockCursor; class WXDLLEXPORT wxSize { @@ -198,7 +199,6 @@ class WXDLLEXPORT wxPenList: public wxList void AddPen(wxPen *pen); void RemovePen(wxPen *pen); wxPen *FindOrCreatePen(const wxColour& colour, int width, int style); - wxPen *FindOrCreatePen(const wxString& colour, int width, int style); }; class WXDLLEXPORT wxBrushList: public wxList @@ -211,7 +211,6 @@ class WXDLLEXPORT wxBrushList: public wxList void AddBrush(wxBrush *brush); void RemoveBrush(wxBrush *brush); wxBrush *FindOrCreateBrush(const wxColour& colour, int style); - wxBrush *FindOrCreateBrush(const wxString& colour, int style); }; WXDLLEXPORT_DATA(extern const char*) wxEmptyString;