diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
| commit | 16b6c991cc841ced6be466eca774dba1188f8640 (patch) | |
| tree | 9b2d82c4e7572e45d8962e69b5c07e8d7da82873 /lib/wx/include/wx.hrl | |
| parent | f66073c2960a4b072e18c4e1dfed143b94cd60c6 (diff) | |
| parent | e92d0d0c4b6991dc751dcc332e11c05d304175b6 (diff) | |
| download | otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.gz otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.bz2 otp-16b6c991cc841ced6be466eca774dba1188f8640.zip | |
Merge branch 'dgud/wx/scale-factor' into maint
* dgud/wx/scale-factor:
wx: Improve error handling
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/wx/include/wx.hrl')
| -rw-r--r-- | lib/wx/include/wx.hrl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl index 8dbfe0c30f..a14cc89cee 100644 --- a/lib/wx/include/wx.hrl +++ b/lib/wx/include/wx.hrl @@ -4092,3 +4092,7 @@ -define(wxWINDOW_VARIANT_MINI, 2). -define(wxWINDOW_VARIANT_LARGE, 3). -define(wxWINDOW_VARIANT_MAX, 4). +% From "xmlres.h": wxXmlResourceFlags +-define(wxXRC_USE_LOCALE, 1). +-define(wxXRC_NO_SUBCLASSING, 2). +-define(wxXRC_NO_RELOADING, 4). |