Mercurial > py-sdl2

changeset 126:1d5ea294b670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- issue #31: SDL_MIXER_VERSION() now returns the correct version - fix a small regression after the hints test fix for Python 3.x
author Marcus von Appen <marcus@sysfault.org>
date Sat, 28 Dec 2013 18:07:47 +0100
parents 14d6416116df
children 4ea9aa952886
files sdl2/sdlmixer.py sdl2/test/hints_test.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/sdl2/sdlmixer.py	Sat Dec 28 09:21:24 2013 +0100
+++ b/sdl2/sdlmixer.py	Sat Dec 28 18:07:47 2013 +0100
@@ -68,9 +68,9 @@
 
 
 def SDL_MIXER_VERSION(x):
-    x.major = SDL_TTF_MAJOR_VERSION
-    x.minor = SDL_TTF_MINOR_VERSION
-    x.patch = SDL_TTF_PATCHLEVEL
+    x.major = SDL_MIXER_MAJOR_VERSION
+    x.minor = SDL_MIXER_MINOR_VERSION
+    x.patch = SDL_MIXER_PATCHLEVEL
 
 MIX_MAJOR_VERSION = SDL_MIXER_MAJOR_VERSION
 MIX_MINOR_VERSION = SDL_MIXER_MINOR_VERSION
--- a/sdl2/test/hints_test.py	Sat Dec 28 09:21:24 2013 +0100
+++ b/sdl2/test/hints_test.py	Sat Dec 28 18:07:47 2013 +0100
@@ -68,7 +68,7 @@
             data = cast(userdata, c_char_p)
             calls.append((data.value, name, oldval, newval))
         hintcb = hints.SDL_HintCallback(callback)
-        udata = c_char_p("banana")
+        udata = c_char_p(b"banana")
         hints.SDL_AddHintCallback(hints.SDL_HINT_ALLOW_TOPMOST, hintcb,
                                   udata)
         # SDL_AddHintCallback invokes the callback once.