diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:40:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:40:30 +0400 |
| commit | 4b449aefea62999aecd0610e6d7f25e6e927c529 (patch) | |
| tree | f061e337d00de3424f0af907c88f4da676befcd9 /intern/ghost | |
| parent | b4907ced60d518cc55e36715defe6f18ba769c29 (diff) | |
remove support for irix
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 26 |
2 files changed, 4 insertions, 24 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 82f65c1c8ae..1bbc8398574 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -26,7 +26,7 @@ if env['WITH_GHOST_SDL']: pass incs += ' ' + env['BF_SDL_INC'] defs += ['WITH_GHOST_SDL'] -elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): +elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): for f in pf: try: sources.remove('intern' + os.sep + f + 'Win32.cpp') diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index d5100e589f2..63bfa9619e4 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -57,16 +57,6 @@ #include <X11/XF86keysym.h> #endif -#ifdef __sgi - -#if defined(_SGI_EXTRA_PREDEFINES) && !defined(NO_FAST_ATOMS) -#include <X11/SGIFastAtom.h> -#else -#define XSGIFastInternAtom(dpy,string,fast_name,how) XInternAtom(dpy,string,how) -#endif - -#endif - // For timing #include <sys/time.h> @@ -98,16 +88,9 @@ GHOST_SystemX11( std::cerr << "Unable to open a display" << std::endl; abort(); //was return before, but this would just mean it will crash later } - -#ifdef __sgi - m_delete_window_atom - = XSGIFastInternAtom(m_display, - "WM_DELETE_WINDOW", - SGI_XA_WM_DELETE_WINDOW, False); -#else + m_delete_window_atom = XInternAtom(m_display, "WM_DELETE_WINDOW", True); -#endif m_wm_protocols= XInternAtom(m_display, "WM_PROTOCOLS", False); m_wm_take_focus= XInternAtom(m_display, "WM_TAKE_FOCUS", False); @@ -630,7 +613,6 @@ GHOST_SystemX11::processEvent(XEvent *xe) { XClientMessageEvent & xcme = xe->xclient; -#ifndef __sgi if (((Atom)xcme.data.l[0]) == m_delete_window_atom) { g_event = new GHOST_Event( @@ -638,10 +620,8 @@ GHOST_SystemX11::processEvent(XEvent *xe) GHOST_kEventWindowClose, window ); - } else -#endif - - if (((Atom)xcme.data.l[0]) == m_wm_take_focus) { + } + else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) { XWindowAttributes attr; Window fwin; int revert_to; |