diff options
| author | Sverker Eriksson <[email protected]> | 2016-03-08 14:46:09 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-03-08 14:46:09 +0100 |
| commit | 7ba125fafa1da21d8780bcdae97f1ef56fb6a39a (patch) | |
| tree | 671891684d94d78211f501371187bb2b425bcdaa /lib/wx/include/wx.hrl | |
| parent | 2dc84032fd2a957b1625aba9bbcea9cbc04aa0df (diff) | |
| parent | 652b67ba8d15ff415a8f30034bd9eb03a9c2b8ca (diff) | |
| download | otp-7ba125fafa1da21d8780bcdae97f1ef56fb6a39a.tar.gz otp-7ba125fafa1da21d8780bcdae97f1ef56fb6a39a.tar.bz2 otp-7ba125fafa1da21d8780bcdae97f1ef56fb6a39a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/include/wx.hrl')
| -rw-r--r-- | lib/wx/include/wx.hrl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl index 1bc00ca235..333ceca50c 100644 --- a/lib/wx/include/wx.hrl +++ b/lib/wx/include/wx.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -4085,7 +4085,3 @@ -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). |