bd30752410
Deprecate the use of the old untyped constants but don't schedule them from removal in a future wx version by removing "#if WXWIN_COMPATIBILITY_3_0" tests around their definition and use. Provoking deprecation warnings in the code using these constants is worth it as they are unclear and it's easy to make mistakes when using them, but breaking this code compilation outright can't be justified -- even in the future. Also use more informational wxDEPRECATED_MSG() instead of a simple wxDEPRECATED() as it might not be obvious at all how should the code be updated exactly. Finally, avoid the use of deprecated constants inside the library itself. As a side effect, this closes #15814. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
130 lines
4.2 KiB
C++
130 lines
4.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/brush.h
|
|
// Purpose: Includes platform-specific wxBrush file
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BRUSH_H_BASE_
|
|
#define _WX_BRUSH_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
#include "wx/object.h"
|
|
#include "wx/gdiobj.h"
|
|
#include "wx/gdicmn.h" // for wxGDIObjListBase
|
|
|
|
// NOTE: these values cannot be combined together!
|
|
enum wxBrushStyle
|
|
{
|
|
wxBRUSHSTYLE_INVALID = -1,
|
|
|
|
wxBRUSHSTYLE_SOLID = wxSOLID,
|
|
wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT,
|
|
wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
|
|
wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
|
|
wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
|
|
wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
|
|
wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
|
|
wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
|
|
wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
|
|
wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
|
|
wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
|
|
wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
|
|
wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
|
|
};
|
|
|
|
|
|
// wxBrushBase
|
|
class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
|
|
{
|
|
public:
|
|
virtual ~wxBrushBase() { }
|
|
|
|
virtual void SetColour(const wxColour& col) = 0;
|
|
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
|
|
virtual void SetStyle(wxBrushStyle style) = 0;
|
|
virtual void SetStipple(const wxBitmap& stipple) = 0;
|
|
|
|
virtual wxColour GetColour() const = 0;
|
|
virtual wxBrushStyle GetStyle() const = 0;
|
|
virtual wxBitmap *GetStipple() const = 0;
|
|
|
|
virtual bool IsHatch() const
|
|
{ return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
|
|
|
|
// Convenient helpers for testing whether the brush is a transparent one:
|
|
// unlike GetStyle() == wxBRUSHSTYLE_TRANSPARENT, they work correctly even
|
|
// if the brush is invalid (they both return false in this case).
|
|
bool IsTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() == wxBRUSHSTYLE_TRANSPARENT;
|
|
}
|
|
|
|
bool IsNonTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() != wxBRUSHSTYLE_TRANSPARENT;
|
|
}
|
|
};
|
|
|
|
#if defined(__WXMSW__)
|
|
#include "wx/msw/brush.h"
|
|
#elif defined(__WXMOTIF__) || defined(__WXX11__)
|
|
#include "wx/x11/brush.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/brush.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/brush.h"
|
|
#elif defined(__WXDFB__)
|
|
#include "wx/dfb/brush.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/brush.h"
|
|
#elif defined(__WXCOCOA__)
|
|
#include "wx/cocoa/brush.h"
|
|
#elif defined(__WXPM__)
|
|
#include "wx/os2/brush.h"
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
|
|
{
|
|
public:
|
|
wxBrush *FindOrCreateBrush(const wxColour& colour,
|
|
wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
|
wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
|
|
{ return FindOrCreateBrush(colour, (wxBrushStyle)style); }
|
|
};
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
|
|
|
|
// provide comparison operators to allow code such as
|
|
//
|
|
// if ( brush.GetStyle() == wxTRANSPARENT )
|
|
//
|
|
// to compile without warnings which it would otherwise provoke from some
|
|
// compilers as it compares elements of different enums
|
|
|
|
// Unfortunately some compilers have ambiguity issues when enum comparisons are
|
|
// overloaded so we have to disable the overloads in this case, see
|
|
// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
|
|
#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
|
|
inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) == static_cast<int>(t);
|
|
}
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
|
|
inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) != static_cast<int>(t);
|
|
}
|
|
|
|
#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
|
|
|
|
#endif // _WX_BRUSH_H_BASE_
|