Mercurial > sdl-ios-xcode
comparison src/video/cocoa/SDL_cocoavideo.m @ 3280:00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sat, 19 Sep 2009 13:29:40 +0000 |
parents | 089a77aebb7d |
children | 59ff7a2beb57 |
comparison
equal
deleted
inserted
replaced
3279:fd207dce9f94 | 3280:00cace2d9080 |
---|---|
100 device->GL_GetSwapInterval = Cocoa_GL_GetSwapInterval; | 100 device->GL_GetSwapInterval = Cocoa_GL_GetSwapInterval; |
101 device->GL_SwapWindow = Cocoa_GL_SwapWindow; | 101 device->GL_SwapWindow = Cocoa_GL_SwapWindow; |
102 device->GL_DeleteContext = Cocoa_GL_DeleteContext; | 102 device->GL_DeleteContext = Cocoa_GL_DeleteContext; |
103 #endif | 103 #endif |
104 | 104 |
105 device->StartTextInput = Cocoa_StartTextInput; | |
106 device->StopTextInput = Cocoa_StopTextInput; | |
107 device->SetTextInputRect = Cocoa_SetTextInputRect; | |
108 | |
105 device->free = Cocoa_DeleteDevice; | 109 device->free = Cocoa_DeleteDevice; |
106 | 110 |
107 return device; | 111 return device; |
108 } | 112 } |
109 | 113 |