← Back to branch summary

~armagetronad-ct/armagetronad/0.4-advrim

« back to all changes in this revision

Viewing changes to src/ui/uMenu.cpp

  • Committer: Voodoo
  • Date: 2013-04-11 10:46:24 UTC
  • Revision ID: voodoo-20130411104624-zse1f33o7ten188z
merge -r 1454..1476 lp:armagetronad/0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/uMenu.cpp
29
29
#include "aa_config.h"
30
30
 
31
31
#ifndef DEDICATED
32
 
#   ifdef MACOSX
33
 
#       include "AAPaste.h"
 
32
#   ifdef MACOSX_XCODE
 
33
#       include "uOSXPaste.h"
34
34
#       include <CoreFoundation/CoreFoundation.h>
35
 
#   else
 
35
#   elif !defined(MACOSX)
36
36
#       include "scrap.h"
37
37
#   endif
38
38
#endif
961
961
        ret = false;
962
962
        //        c.sym = SDLK_DOWN;
963
963
    }
964
 
#ifdef MACOSX
 
964
#ifdef MACOSX_XCODE
965
965
    else if (c.sym == SDLK_v && mod & KMOD_META) {
966
966
        CFDataRef data;
967
 
        if (AAPastePasteboardData(data)) {
 
967
        if (su_OSXPastePasteboardData(data)) {
968
968
            const UInt8 *bytes = CFDataGetBytePtr(data);
969
969
            CFIndex bytesLength = CFDataGetLength(data);
970
970
            
979
979
            ret = false;
980
980
        }
981
981
    }
982
 
#else
 
982
#elif !defined(MACOSX)
983
983
    else if (c.sym == SDLK_v && mod & KMOD_CTRL) {
984
984
        char *scrap = 0;
985
985
        int scraplen;