Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 31, 2016, 11:22:34 AM (8 years ago)
Author:
ahedges
Message:

comment out some carbon stuff and add tolua++

Location:
code/branches/mac_HS16/src/external
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/mac_HS16/src/external/ois/mac/MacInputManager.cpp

    r8351 r11251  
    9292                // else get the main active window.. user might not have access to it through some
    9393                // graphics libraries, if that fails then try at the application level.
    94                 mWindow = ActiveNonFloatingWindow();
    95                 if(mWindow == NULL)
    96                 {
     94//              mWindow = ActiveNonFloatingWindow();
     95//              if(mWindow == NULL)
     96//              {
    9797                        mEventTargetRef = GetApplicationEventTarget();
    98                 }
    99                 else
    100                 {
    101                         //mEventTargetRef = GetWindowEventTarget(mWindow);
    102                         mEventTargetRef = GetApplicationEventTarget();
    103                 }
     98//              }
     99//              else
     100//              {
     101//                      //mEventTargetRef = GetWindowEventTarget(mWindow);
     102//                      mEventTargetRef = GetApplicationEventTarget();
     103//              }
    104104        }
    105105       
  • code/branches/mac_HS16/src/external/ois/mac/MacKeyboard.cpp

    r8351 r11251  
    203203                //get string size
    204204                UInt32 stringsize;
    205                 status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
     205        status = 0;//GetEventParameter(theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
    206206               
    207207                if(stringsize > 0)
  • code/branches/mac_HS16/src/external/ois/mac/MacMouse.cpp

    r5781 r11251  
    7171        {
    7272                Rect clipRect = {0.0f, 0.0f, 0.0f, 0.0f};
    73                 GetWindowBounds(win, kWindowContentRgn, &clipRect);
     73//              GetWindowBounds(win, kWindowContentRgn, &clipRect);
    7474               
    7575                CGPoint warpPoint;
     
    281281                                {
    282282                                        Rect clipRect = {0.0f, 0.0f, 0.0f, 0.0f};
    283                                         GetWindowBounds(win, kWindowContentRgn, &clipRect);
    284                                        
     283//                                      GetWindowBounds(win, kWindowContentRgn, &clipRect);
     284
    285285                                        CGPoint warpPoint;
    286286                                        warpPoint.x = ((clipRect.right - clipRect.left) / 2) + clipRect.left;
  • code/branches/mac_HS16/src/external/tolua/CMakeLists.txt

    r8351 r11251  
    3535SET(TOLUA_PARSER_DEPENDENCIES
    3636  toluaapp_orxonox
     37  ${CMAKE_CURRENT_SOURCE_DIR}/tolua++.h
    3738  ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
    3839  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
Note: See TracChangeset for help on using the changeset viewer.