Mercurial > sdl-ios-xcode

comparison src/video/SDL_video.c @ 4755:436183eb30c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main repo (mainly for non-printable character fix)
author dewyatt
date Sun, 18 Jul 2010 13:48:23 -0400
parents 11b0a6a3eb4d c04dd942610d
children 518d1679d2d0
comparison
equal deleted inserted replaced
4754:2072fed2f583 4755:436183eb30c8
2831 } 2831 }
2832 if (_this->displays) { 2832 if (_this->displays) {
2833 SDL_free(_this->displays); 2833 SDL_free(_this->displays);
2834 _this->displays = NULL; 2834 _this->displays = NULL;
2835 } 2835 }
2836 if (_this->clipboard_text) {
2837 SDL_free(_this->clipboard_text);
2838 _this->clipboard_text = NULL;
2839 }
2836 _this->free(_this); 2840 _this->free(_this);
2837 _this = NULL; 2841 _this = NULL;
2838 } 2842 }
2839 2843
2840 int 2844 int
3265 } 3269 }
3266 3270
3267 void 3271 void
3268 SDL_GL_DeleteContext(SDL_GLContext context) 3272 SDL_GL_DeleteContext(SDL_GLContext context)
3269 { 3273 {
3270 if (!_this || !context) { 3274 if (!_this || !_this->gl_data || !context) {
3271 return; 3275 return;
3272 } 3276 }
3273 _this->GL_MakeCurrent(_this, NULL, NULL); 3277 _this->GL_MakeCurrent(_this, NULL, NULL);
3274 _this->GL_DeleteContext(_this, context); 3278 _this->GL_DeleteContext(_this, context);
3275 } 3279 }