Fix enum that have changed values

Some more enums have been added/changed definitions and can no longer
be constants in wx.hrl

3 files changed, 96 insertions, 9 deletions

diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index afddd92a03..b979ad00b2 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -41,7 +41,11 @@
               wxFONTWEIGHT_NORMAL,
               wxFONTWEIGHT_LIGHT,
               wxFONTWEIGHT_BOLD,
-              wxFONTWEIGHT_MAX
+              wxFONTWEIGHT_MAX,
+
+              wxBackgroundStyle,
+              wxIMAGE_QUALITY_NORMAL,
+              wxIMAGE_QUALITY_HIGH
 	     ]}.
 
 {gvars,
@@ -61,6 +65,17 @@
   {wxFONTWEIGHT_HEAVY, {test_if, "wxCHECK_VERSION(3,1,2)"}},
   {wxFONTWEIGHT_EXTRAHEAVY, {test_if, "wxCHECK_VERSION(3,1,2)"}},
 
+  %% Added (enum) values in 3.0.0
+  {wxBG_STYLE_ERASE, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {wxBG_STYLE_PAINT, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {wxBG_STYLE_TRANSPARENT,{test_if, "wxCHECK_VERSION(3,0,0)"}},
+
+  %% Added (enum) values
+  {wxIMAGE_QUALITY_NEAREST, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {wxIMAGE_QUALITY_BILINEAR, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {wxIMAGE_QUALITY_BICUBIC, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {wxIMAGE_QUALITY_BOX_AVERAGE, {test_if, "wxCHECK_VERSION(3,0,0)"}},
+
   {wxBLACK_DASHED_PEN, wxPen},
   {wxBLACK_PEN, wxPen},
   {wxCYAN_PEN, wxPen},
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index 5a52d69003..993fb30889 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2018. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2019. 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.
@@ -51,6 +51,16 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addTupleCount(2);
  rt.addAtom("wxSUBRELEASE_NUMBER"); rt.addInt(wxSUBRELEASE_NUMBER);
  rt.addTupleCount(2);
+ rt.addAtom("wxIMAGE_QUALITY_HIGH"); rt.addInt(wxIMAGE_QUALITY_HIGH);
+ rt.addTupleCount(2);
+ rt.addAtom("wxIMAGE_QUALITY_NORMAL"); rt.addInt(wxIMAGE_QUALITY_NORMAL);
+ rt.addTupleCount(2);
+ rt.addAtom("wxBG_STYLE_COLOUR"); rt.addInt(wxBG_STYLE_COLOUR);
+ rt.addTupleCount(2);
+ rt.addAtom("wxBG_STYLE_CUSTOM"); rt.addInt(wxBG_STYLE_CUSTOM);
+ rt.addTupleCount(2);
+ rt.addAtom("wxBG_STYLE_SYSTEM"); rt.addInt(wxBG_STYLE_SYSTEM);
+ rt.addTupleCount(2);
  rt.addAtom("wxFONTENCODING_UTF16"); rt.addInt(wxFONTENCODING_UTF16);
  rt.addTupleCount(2);
  rt.addAtom("wxFONTENCODING_UTF32"); rt.addInt(wxFONTENCODING_UTF32);
@@ -642,6 +652,27 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addAtom("WX_GL_SAMPLE_BUFFERS"); rt.addAtom("undefined");
  rt.addTupleCount(2);
 #endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxBG_STYLE_ERASE"); rt.addInt(wxBG_STYLE_ERASE);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxBG_STYLE_ERASE"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxBG_STYLE_PAINT"); rt.addInt(wxBG_STYLE_PAINT);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxBG_STYLE_PAINT"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxBG_STYLE_TRANSPARENT"); rt.addInt(wxBG_STYLE_TRANSPARENT);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxBG_STYLE_TRANSPARENT"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
    rt.addAtom("wxBLACK"); rt.add(*(wxBLACK));
    rt.addTupleCount(2);
    rt.addAtom("wxBLACK_BRUSH"); rt.addRef(getRef((void *)wxBLACK_BRUSH,memenv),"wxBrush");
@@ -730,6 +761,34 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
    rt.addTupleCount(2);
    rt.addAtom("wxHOURGLASS_CURSOR"); rt.addRef(getRef((void *)wxHOURGLASS_CURSOR,memenv),"wxCursor");
    rt.addTupleCount(2);
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxIMAGE_QUALITY_BICUBIC"); rt.addInt(wxIMAGE_QUALITY_BICUBIC);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxIMAGE_QUALITY_BICUBIC"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxIMAGE_QUALITY_BILINEAR"); rt.addInt(wxIMAGE_QUALITY_BILINEAR);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxIMAGE_QUALITY_BILINEAR"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxIMAGE_QUALITY_BOX_AVERAGE"); rt.addInt(wxIMAGE_QUALITY_BOX_AVERAGE);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxIMAGE_QUALITY_BOX_AVERAGE"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("wxIMAGE_QUALITY_NEAREST"); rt.addInt(wxIMAGE_QUALITY_NEAREST);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxIMAGE_QUALITY_NEAREST"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
    rt.addAtom("wxITALIC_FONT"); rt.addRef(getRef((void *)wxITALIC_FONT,memenv),"wxFont");
    rt.addTupleCount(2);
    rt.addAtom("wxLIGHT_GREY"); rt.add(*(wxLIGHT_GREY));
@@ -787,7 +846,7 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addAtom("wx_GL_COMPAT_PROFILE"); rt.addAtom("undefined");
  rt.addTupleCount(2);
 #endif
- rt.endList(321);
+ rt.endList(333);
  rt.addTupleCount(2);
   rt.send();
 }
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index 2c145595ee..4e62c206d6 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2019. 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.
@@ -388,6 +388,9 @@
 -define('WX_GL_ROBUST_ACCESS',  wxe_util:get_const('WX_GL_ROBUST_ACCESS')).
 -define('WX_GL_SAMPLES',  wxe_util:get_const('WX_GL_SAMPLES')).
 -define('WX_GL_SAMPLE_BUFFERS',  wxe_util:get_const('WX_GL_SAMPLE_BUFFERS')).
+-define(wxBG_STYLE_ERASE,  wxe_util:get_const(wxBG_STYLE_ERASE)).
+-define(wxBG_STYLE_PAINT,  wxe_util:get_const(wxBG_STYLE_PAINT)).
+-define(wxBG_STYLE_TRANSPARENT,  wxe_util:get_const(wxBG_STYLE_TRANSPARENT)).
 -define(wxBLACK,  wxe_util:get_const(wxBLACK)).
 -define(wxBLACK_BRUSH,  wxe_util:get_const(wxBLACK_BRUSH)).
 -define(wxBLACK_DASHED_PEN,  wxe_util:get_const(wxBLACK_DASHED_PEN)).
@@ -412,6 +415,10 @@
 -define(wxGREY_BRUSH,  wxe_util:get_const(wxGREY_BRUSH)).
 -define(wxGREY_PEN,  wxe_util:get_const(wxGREY_PEN)).
 -define(wxHOURGLASS_CURSOR,  wxe_util:get_const(wxHOURGLASS_CURSOR)).
+-define(wxIMAGE_QUALITY_BICUBIC,  wxe_util:get_const(wxIMAGE_QUALITY_BICUBIC)).
+-define(wxIMAGE_QUALITY_BILINEAR,  wxe_util:get_const(wxIMAGE_QUALITY_BILINEAR)).
+-define(wxIMAGE_QUALITY_BOX_AVERAGE,  wxe_util:get_const(wxIMAGE_QUALITY_BOX_AVERAGE)).
+-define(wxIMAGE_QUALITY_NEAREST,  wxe_util:get_const(wxIMAGE_QUALITY_NEAREST)).
 -define(wxITALIC_FONT,  wxe_util:get_const(wxITALIC_FONT)).
 -define(wxLIGHT_GREY,  wxe_util:get_const(wxLIGHT_GREY)).
 -define(wxLIGHT_GREY_BRUSH,  wxe_util:get_const(wxLIGHT_GREY_BRUSH)).
@@ -736,6 +743,12 @@
 -define(wxACCEL_CTRL, 2).
 -define(wxACCEL_SHIFT, 4).
 -define(wxACCEL_CMD, ?wxACCEL_CTRL).
+% From "added__func.h"
+-define(wxMOUSE_BTN_AUX2, 5).
+-define(wxMOUSE_BTN_AUX1, 4).
+% From "added__func.h": wxMouseWheelAxis
+-define(wxMOUSE_WHEEL_VERTICAL, 0).
+-define(wxMOUSE_WHEEL_HORIZONTAL, 1).
 % From "app.h"
 -define(wxPRINT_WINDOWS, 1).
 -define(wxPRINT_POSTSCRIPT, 2).
@@ -1225,9 +1238,9 @@
 -define(wxALIGN_CENTRE, ?wxALIGN_CENTER).
 -define(wxALIGN_MASK, 3840).
 % From "defs.h": wxBackgroundStyle
--define(wxBG_STYLE_SYSTEM, 0).
--define(wxBG_STYLE_COLOUR, 1).
--define(wxBG_STYLE_CUSTOM, 2).
+-define(wxBG_STYLE_SYSTEM, wxe_util:get_const(wxBG_STYLE_SYSTEM)).
+-define(wxBG_STYLE_COLOUR, wxe_util:get_const(wxBG_STYLE_COLOUR)).
+-define(wxBG_STYLE_CUSTOM, wxe_util:get_const(wxBG_STYLE_CUSTOM)).
 % From "defs.h": wxBorder
 -define(wxBORDER_DEFAULT, 0).
 -define(wxBORDER_NONE, 2097152).
@@ -2032,8 +2045,8 @@
 -define(wxIMAGE_RESOLUTION_INCHES, 1).
 -define(wxIMAGE_RESOLUTION_CM, 2).
 % From "image.h"
--define(wxIMAGE_QUALITY_NORMAL, 0).
--define(wxIMAGE_QUALITY_HIGH, 1).
+-define(wxIMAGE_QUALITY_NORMAL, wxe_util:get_const(wxIMAGE_QUALITY_NORMAL)).
+-define(wxIMAGE_QUALITY_HIGH, wxe_util:get_const(wxIMAGE_QUALITY_HIGH)).
 % From "imaglist.h"
 -define(wxIMAGE_LIST_NORMAL, 0).
 -define(wxIMAGE_LIST_SMALL, 1).