diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
| commit | de36dd1e99476f311055a4ac62aacc3cdbda193b (patch) | |
| tree | 9035b7cd8fc2d97f4689c07454adadf6e6244ad9 /intern | |
| parent | dd2db3703f4d3b36e33aa0cec31aea697227ba89 (diff) | |
| parent | f45dcf022db02272d495ddfb07ffffe50e3f7f70 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099:22130
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 8 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e5e88502f45..dbdb65a14f4 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -155,11 +155,9 @@ init( GHOST_TSuccess success = GHOST_System::init(); if (success) { - m_keyboard_vector = new char[32]; - m_displayManager = new GHOST_DisplayManagerX11(this); - if (m_keyboard_vector && m_displayManager) { + if (m_displayManager) { return GHOST_kSuccess; } } @@ -715,9 +713,9 @@ getModifierKeys( // analyse the masks retuned from XQueryPointer. - memset(m_keyboard_vector,0,sizeof(m_keyboard_vector)); + memset((void *)m_keyboard_vector,0,sizeof(m_keyboard_vector)); - XQueryKeymap(m_display,m_keyboard_vector); + XQueryKeymap(m_display,(char *)m_keyboard_vector); // now translate key symobols into keycodes and // test with vector. diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 711a188ffe9..afd960d1ec3 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -258,7 +258,7 @@ private : GHOST_TUns64 m_start_time; /// A vector of keyboard key masks - char *m_keyboard_vector; + char m_keyboard_vector[32]; /** * Return the ghost window associated with the diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 1525b4eb16d..41c62be0966 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -187,6 +187,8 @@ GHOST_WindowX11( printf("%s:%d: X11 glxChooseVisual() failed for OpenGL, verify working openGL system!\n", __FILE__, __LINE__); return; } + + memset(&m_xtablet, 0, sizeof(m_xtablet)); // Create a bunch of attributes needed to create an X window. |