diff options
| author | Dan Gudmundsson <[email protected]> | 2016-03-08 08:57:40 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-03-08 08:57:40 +0100 |
| commit | 9bfbf4319a42be7572334b57c3e16864681c252c (patch) | |
| tree | 24e81d691c2fe9e8d945415867239e2accc9e421 /lib/wx/include/wx.hrl | |
| parent | 2a44ac37f487001b551c0103ed0b4c5ab4579ff1 (diff) | |
| parent | cd754f764825d71a5e5021c617a74d2dac211409 (diff) | |
| download | otp-9bfbf4319a42be7572334b57c3e16864681c252c.tar.gz otp-9bfbf4319a42be7572334b57c3e16864681c252c.tar.bz2 otp-9bfbf4319a42be7572334b57c3e16864681c252c.zip | |
Merge remote-tracking branch 'origin/dgud/wx/bugs' into maint
* origin/dgud/wx/bugs:
wx: Use wrapper classes where possible
wx: Wait before throwing away early callbacks to wx_objects
wx: Add wxWindow:SetTransparent and CanSetTransperant
wx: Add wxWindow SetDoubleBuffered and IsDoubleBuffered from wxWidgets 3.0
wx: Remove http_util usage
wx: Tiny optimization
wx: Fix a crash with sending two binaries to command queue
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). |