diff options
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/c_src/egl_impl.cpp | 6 | ||||
| -rw-r--r-- | lib/wx/doc/src/notes.xml | 27 | ||||
| -rw-r--r-- | lib/wx/vsn.mk | 2 |
3 files changed, 32 insertions, 3 deletions
diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp index 61e05ee6f1..06c1de9cb6 100644 --- a/lib/wx/c_src/egl_impl.cpp +++ b/lib/wx/c_src/egl_impl.cpp @@ -48,6 +48,7 @@ int egl_initiated = 0; #define OPENGLU_LIB L"glu32.dll" typedef HMODULE DL_LIB_P; typedef WCHAR DL_CHAR; +#define DL_STR_FMT "%S" void * dlsym(HMODULE Lib, const char *func) { void * funcp; if((funcp = (void *) GetProcAddress(Lib, func))) @@ -67,6 +68,7 @@ void dlclose(HMODULE Lib) { #else typedef void * DL_LIB_P; typedef char DL_CHAR; +# define DL_STR_FMT "%s" # ifdef _MACOSX # define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" # define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib" @@ -125,7 +127,7 @@ int load_gl_functions() { // dlclose(LIBhandle); // fprintf(stderr, "OPENGL library is loaded\r\n"); } else { - fprintf(stderr, "Could NOT load OpenGL library: %s\r\n", DLName); + fprintf(stderr, "Could NOT load OpenGL library: " DL_STR_FMT "\r\n", DLName); }; DLName = (DL_CHAR *) OPENGLU_LIB; @@ -154,7 +156,7 @@ int load_gl_functions() { // dlclose(LIBhandle); // fprintf(stderr, "GLU library is loaded\r\n"); } else { - fprintf(stderr, "Could NOT load OpenGL GLU library: %s\r\n", DLName); + fprintf(stderr, "Could NOT load OpenGL GLU library: " DL_STR_FMT "\r\n", DLName); }; return 1; diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml index 7dcfbb1588..b9012054a8 100644 --- a/lib/wx/doc/src/notes.xml +++ b/lib/wx/doc/src/notes.xml @@ -32,6 +32,33 @@ <p>This document describes the changes made to the wxErlang application.</p> +<section><title>Wx 1.9.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix various compiler warnings on 64-bit Windows.</p> + <p> + Own Id: OTP-15800</p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p>Refactored the internal handling of deprecated and + removed functions.</p> + <p> + Own Id: OTP-16469</p> + </item> + </list> + </section> + +</section> + <section><title>Wx 1.9</title> <section><title>Improvements and New Features</title> diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk index b498d21f3f..552e09ee2a 100644 --- a/lib/wx/vsn.mk +++ b/lib/wx/vsn.mk @@ -1 +1 @@ -WX_VSN = 1.9 +WX_VSN = 1.9.1 |