diff options
author | Dan Gudmundsson <[email protected]> | 2019-02-18 13:00:33 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2019-02-18 13:00:33 +0100 |
commit | d04ceae537e037555cb0ae962f3164dc6c499340 (patch) | |
tree | 7a11a18d336f662414dfeb7fb7b867fc5ce7d560 /lib/wx/include/wx.hrl | |
parent | 5ba931478460f2ed667f1ff145c3b0af4a00155e (diff) | |
parent | d7805acb99f2b7ccd97541d189f6494966564d98 (diff) | |
download | otp-d04ceae537e037555cb0ae962f3164dc6c499340.tar.gz otp-d04ceae537e037555cb0ae962f3164dc6c499340.tar.bz2 otp-d04ceae537e037555cb0ae962f3164dc6c499340.zip |
Merge branch 'dgud/wx/extend-functionality/OTP-15587' into maint
* dgud/wx/extend-functionality/OTP-15587:
Fix showModal crash on Mojave
Add wxGCDC
wx: Add wxDisplay
wx: Change wxFONTWEIGHT enums
Let wxwidgets check events
Diffstat (limited to 'lib/wx/include/wx.hrl')
-rw-r--r-- | lib/wx/include/wx.hrl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl index 23f3b95403..2c145595ee 100644 --- a/lib/wx/include/wx.hrl +++ b/lib/wx/include/wx.hrl @@ -398,6 +398,14 @@ -define(wxCYAN, wxe_util:get_const(wxCYAN)). -define(wxCYAN_BRUSH, wxe_util:get_const(wxCYAN_BRUSH)). -define(wxCYAN_PEN, wxe_util:get_const(wxCYAN_PEN)). +-define(wxFONTWEIGHT_EXTRABOLD, wxe_util:get_const(wxFONTWEIGHT_EXTRABOLD)). +-define(wxFONTWEIGHT_EXTRAHEAVY, wxe_util:get_const(wxFONTWEIGHT_EXTRAHEAVY)). +-define(wxFONTWEIGHT_EXTRALIGHT, wxe_util:get_const(wxFONTWEIGHT_EXTRALIGHT)). +-define(wxFONTWEIGHT_HEAVY, wxe_util:get_const(wxFONTWEIGHT_HEAVY)). +-define(wxFONTWEIGHT_INVALID, wxe_util:get_const(wxFONTWEIGHT_INVALID)). +-define(wxFONTWEIGHT_MEDIUM, wxe_util:get_const(wxFONTWEIGHT_MEDIUM)). +-define(wxFONTWEIGHT_SEMIBOLD, wxe_util:get_const(wxFONTWEIGHT_SEMIBOLD)). +-define(wxFONTWEIGHT_THIN, wxe_util:get_const(wxFONTWEIGHT_THIN)). -define(wxGREEN, wxe_util:get_const(wxGREEN)). -define(wxGREEN_BRUSH, wxe_util:get_const(wxGREEN_BRUSH)). -define(wxGREEN_PEN, wxe_util:get_const(wxGREEN_PEN)). @@ -1685,10 +1693,10 @@ -define(wxFONTSTYLE_SLANT, ?wxSLANT). -define(wxFONTSTYLE_MAX, (?wxSLANT+1)). % From "font.h": wxFontWeight --define(wxFONTWEIGHT_NORMAL, ?wxNORMAL). --define(wxFONTWEIGHT_LIGHT, ?wxLIGHT). --define(wxFONTWEIGHT_BOLD, ?wxBOLD). --define(wxFONTWEIGHT_MAX, (?wxBOLD+1)). +-define(wxFONTWEIGHT_NORMAL, wxe_util:get_const(wxFONTWEIGHT_NORMAL)). +-define(wxFONTWEIGHT_LIGHT, wxe_util:get_const(wxFONTWEIGHT_LIGHT)). +-define(wxFONTWEIGHT_BOLD, wxe_util:get_const(wxFONTWEIGHT_BOLD)). +-define(wxFONTWEIGHT_MAX, wxe_util:get_const(wxFONTWEIGHT_MAX)). % From "fontenc.h": wxFontEncoding -define(wxFONTENCODING_SYSTEM, -1). -define(wxFONTENCODING_DEFAULT, 0). |