mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 15:49:50 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
comex
58
Externals/wxWidgets3/include/wx/textctrl.h
vendored
58
Externals/wxWidgets3/include/wx/textctrl.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 13.07.99
|
||||
// RCS-ID: $Id: textctrl.h 70446 2012-01-23 11:28:28Z VZ $
|
||||
// Copyright: (c) Vadim Zeitlin
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -28,7 +27,6 @@
|
||||
// some compilers don't have standard compliant rdbuf() (and MSVC has it only
|
||||
// in its new iostream library, not in the old one used with iostream.h)
|
||||
#if defined(__WATCOMC__) || \
|
||||
defined(__MWERKS__) || \
|
||||
((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH)
|
||||
#define wxHAS_TEXT_WINDOW_STREAM 0
|
||||
#elif wxUSE_STD_IOSTREAM
|
||||
@ -167,13 +165,16 @@ enum wxTextAttrFlags
|
||||
wxTEXT_ATTR_BACKGROUND_COLOUR = 0x00000002,
|
||||
|
||||
wxTEXT_ATTR_FONT_FACE = 0x00000004,
|
||||
wxTEXT_ATTR_FONT_SIZE = 0x00000008,
|
||||
wxTEXT_ATTR_FONT_POINT_SIZE = 0x00000008,
|
||||
wxTEXT_ATTR_FONT_PIXEL_SIZE = 0x10000000,
|
||||
wxTEXT_ATTR_FONT_WEIGHT = 0x00000010,
|
||||
wxTEXT_ATTR_FONT_ITALIC = 0x00000020,
|
||||
wxTEXT_ATTR_FONT_UNDERLINE = 0x00000040,
|
||||
wxTEXT_ATTR_FONT_STRIKETHROUGH = 0x08000000,
|
||||
wxTEXT_ATTR_FONT_ENCODING = 0x02000000,
|
||||
wxTEXT_ATTR_FONT_FAMILY = 0x04000000,
|
||||
wxTEXT_ATTR_FONT_SIZE = \
|
||||
( wxTEXT_ATTR_FONT_POINT_SIZE | wxTEXT_ATTR_FONT_PIXEL_SIZE ),
|
||||
wxTEXT_ATTR_FONT = \
|
||||
( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \
|
||||
wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_STRIKETHROUGH | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ),
|
||||
@ -241,7 +242,9 @@ enum wxTextAttrBulletStyle
|
||||
|
||||
wxTEXT_ATTR_BULLET_STYLE_ALIGN_LEFT = 0x00000000,
|
||||
wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT = 0x00001000,
|
||||
wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE = 0x00002000
|
||||
wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE = 0x00002000,
|
||||
|
||||
wxTEXT_ATTR_BULLET_STYLE_CONTINUATION = 0x00004000
|
||||
};
|
||||
|
||||
/*!
|
||||
@ -299,8 +302,11 @@ public:
|
||||
// Equality test
|
||||
bool operator== (const wxTextAttr& attr) const;
|
||||
|
||||
// Partial equality test
|
||||
bool EqPartial(const wxTextAttr& attr) const;
|
||||
// Partial equality test. If @a weakTest is @true, attributes of this object do not
|
||||
// have to be present if those attributes of @a attr are present. If @a weakTest is
|
||||
// @false, the function will fail if an attribute is present in @a attr but not
|
||||
// in this object.
|
||||
bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const;
|
||||
|
||||
// Get attributes from font.
|
||||
bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
|
||||
@ -313,7 +319,9 @@ public:
|
||||
void SetLeftIndent(int indent, int subIndent = 0) { m_leftIndent = indent; m_leftSubIndent = subIndent; m_flags |= wxTEXT_ATTR_LEFT_INDENT; }
|
||||
void SetRightIndent(int indent) { m_rightIndent = indent; m_flags |= wxTEXT_ATTR_RIGHT_INDENT; }
|
||||
|
||||
void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags |= wxTEXT_ATTR_FONT_SIZE; }
|
||||
void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
|
||||
void SetFontPointSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
|
||||
void SetFontPixelSize(int pixelSize) { m_fontSize = pixelSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_PIXEL_SIZE; }
|
||||
void SetFontStyle(wxFontStyle fontStyle) { m_fontStyle = fontStyle; m_flags |= wxTEXT_ATTR_FONT_ITALIC; }
|
||||
void SetFontWeight(wxFontWeight fontWeight) { m_fontWeight = fontWeight; m_flags |= wxTEXT_ATTR_FONT_WEIGHT; }
|
||||
void SetFontFaceName(const wxString& faceName) { m_fontFaceName = faceName; m_flags |= wxTEXT_ATTR_FONT_FACE; }
|
||||
@ -323,7 +331,7 @@ public:
|
||||
void SetFontFamily(wxFontFamily family) { m_fontFamily = family; m_flags |= wxTEXT_ATTR_FONT_FAMILY; }
|
||||
|
||||
// Set font
|
||||
void SetFont(const wxFont& font, int flags = wxTEXT_ATTR_FONT) { GetFontAttributes(font, flags); }
|
||||
void SetFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE)) { GetFontAttributes(font, flags); }
|
||||
|
||||
void SetFlags(long flags) { m_flags = flags; }
|
||||
|
||||
@ -390,6 +398,8 @@ public:
|
||||
bool HasRightIndent() const { return HasFlag(wxTEXT_ATTR_RIGHT_INDENT); }
|
||||
bool HasFontWeight() const { return HasFlag(wxTEXT_ATTR_FONT_WEIGHT); }
|
||||
bool HasFontSize() const { return HasFlag(wxTEXT_ATTR_FONT_SIZE); }
|
||||
bool HasFontPointSize() const { return HasFlag(wxTEXT_ATTR_FONT_POINT_SIZE); }
|
||||
bool HasFontPixelSize() const { return HasFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE); }
|
||||
bool HasFontItalic() const { return HasFlag(wxTEXT_ATTR_FONT_ITALIC); }
|
||||
bool HasFontUnderlined() const { return HasFlag(wxTEXT_ATTR_FONT_UNDERLINE); }
|
||||
bool HasFontStrikethrough() const { return HasFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH); }
|
||||
@ -432,7 +442,7 @@ public:
|
||||
// is non-NULL, then it will be used to mask out those attributes that are the same in style
|
||||
// and compareWith, for situations where we don't want to explicitly set inherited attributes.
|
||||
bool Apply(const wxTextAttr& style, const wxTextAttr* compareWith = NULL);
|
||||
|
||||
|
||||
// merges the attributes of the base and the overlay objects and returns
|
||||
// the result; the parameter attributes take precedence
|
||||
//
|
||||
@ -725,6 +735,9 @@ public:
|
||||
wxTextEntry::SetValue(value);
|
||||
}
|
||||
|
||||
// wxTextEntry overrides
|
||||
virtual bool SetHint(const wxString& hint);
|
||||
|
||||
// wxWindow overrides
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
{
|
||||
@ -743,9 +756,6 @@ protected:
|
||||
int overflow(int i);
|
||||
#endif // wxHAS_TEXT_WINDOW_STREAM
|
||||
|
||||
virtual bool DoLoadFile(const wxString& file, int fileType);
|
||||
virtual bool DoSaveFile(const wxString& file, int fileType);
|
||||
|
||||
// Another wxTextAreaBase override.
|
||||
virtual bool IsValidPosition(long pos) const
|
||||
{
|
||||
@ -791,17 +801,17 @@ protected:
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent;
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_ENTER, wxCommandEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_URL, wxTextUrlEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_MAXLEN, wxCommandEvent);
|
||||
|
||||
class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxTextUrlEvent(int winid, const wxMouseEvent& evtMouse,
|
||||
long start, long end)
|
||||
: wxCommandEvent(wxEVT_COMMAND_TEXT_URL, winid),
|
||||
: wxCommandEvent(wxEVT_TEXT_URL, winid),
|
||||
m_evtMouse(evtMouse), m_start(start), m_end(end)
|
||||
{ }
|
||||
wxTextUrlEvent(const wxTextUrlEvent& event)
|
||||
@ -810,7 +820,7 @@ public:
|
||||
m_start(event.m_start),
|
||||
m_end(event.m_end) { }
|
||||
|
||||
// get the mouse event which happend over the URL
|
||||
// get the mouse event which happened over the URL
|
||||
const wxMouseEvent& GetMouseEvent() const { return m_evtMouse; }
|
||||
|
||||
// get the start of the URL
|
||||
@ -844,12 +854,12 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
|
||||
wxEVENT_HANDLER_CAST(wxTextUrlEventFunction, func)
|
||||
|
||||
#define wx__DECLARE_TEXTEVT(evt, id, fn) \
|
||||
wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn))
|
||||
wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextEventHandler(fn))
|
||||
|
||||
#define wx__DECLARE_TEXTURLEVT(evt, id, fn) \
|
||||
wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextUrlEventHandler(fn))
|
||||
wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextUrlEventHandler(fn))
|
||||
|
||||
#define EVT_TEXT(id, fn) wx__DECLARE_TEXTEVT(UPDATED, id, fn)
|
||||
#define EVT_TEXT(id, fn) wx__DECLARE_EVT1(wxEVT_TEXT, id, wxTextEventHandler(fn))
|
||||
#define EVT_TEXT_ENTER(id, fn) wx__DECLARE_TEXTEVT(ENTER, id, fn)
|
||||
#define EVT_TEXT_URL(id, fn) wx__DECLARE_TEXTURLEVT(URL, id, fn)
|
||||
#define EVT_TEXT_MAXLEN(id, fn) wx__DECLARE_TEXTEVT(MAXLEN, id, fn)
|
||||
@ -898,6 +908,12 @@ private:
|
||||
|
||||
#endif // wxHAS_TEXT_WINDOW_STREAM
|
||||
|
||||
// old wxEVT_COMMAND_* constants
|
||||
#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT
|
||||
#define wxEVT_COMMAND_TEXT_ENTER wxEVT_TEXT_ENTER
|
||||
#define wxEVT_COMMAND_TEXT_URL wxEVT_TEXT_URL
|
||||
#define wxEVT_COMMAND_TEXT_MAXLEN wxEVT_TEXT_MAXLEN
|
||||
|
||||
#endif // wxUSE_TEXTCTRL
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user