TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Changes for Linux.

Browse source
This commit is contained in:
LuisAntonRebollo 2015-01-18 21:35:11 +01:00
parent aa35157eef
commit 3336bffad2
30 changed files with 99 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/windowManager/platformCursorController.cpp
View file

@ -28,8 +28,8 @@ void PlatformCursorController::pushCursor( S32 cursorID )
// Place the new cursor shape onto the stack
mCursors.increment();
CursorShape &shape = mCursors.last();
shape.mCursorType = CursorShape::TYPE_RESOURCE;
Cursor_Shape &shape = mCursors.last();
shape.mCursorType = Cursor_Shape::TYPE_RESOURCE;
shape.mCursorID = cursorID;
// Now Change the Cursor Shape.
@ -42,8 +42,8 @@ void PlatformCursorController::pushCursor( const UTF8 *fileName )
mCursors.increment();
// Store the Details.
CursorShape &shape = mCursors.last();
shape.mCursorType = CursorShape::TYPE_FILE;
Cursor_Shape &shape = mCursors.last();
shape.mCursorType = Cursor_Shape::TYPE_FILE;
shape.mCursorFile = String::ToString( "%s", fileName );
// Now Change the Cursor Shape.
@ -71,11 +71,11 @@ void PlatformCursorController::refreshCursor()
setCursorShape( mCursors.last(), false );
}
void PlatformCursorController::setCursorShape( const CursorShape &shape, bool reload )
void PlatformCursorController::setCursorShape( const Cursor_Shape &shape, bool reload )
{
switch( shape.mCursorType )
{
case CursorShape::TYPE_RESOURCE :
case Cursor_Shape::TYPE_RESOURCE :
{
// Set Resource.
@ -83,7 +83,7 @@ void PlatformCursorController::setCursorShape( const CursorShape &shape, bool re
} break;
case CursorShape::TYPE_FILE :
case Cursor_Shape::TYPE_FILE :
{
// Set File.
@ -91,4 +91,4 @@ void PlatformCursorController::setCursorShape( const CursorShape &shape, bool re
} break;
}
}
}

8
Engine/source/windowManager/platformCursorController.h
View file

@ -33,7 +33,7 @@ class PlatformCursorController
{
protected:
struct CursorShape
struct Cursor_Shape
{
enum Type
{
@ -46,7 +46,7 @@ protected:
String mCursorFile; // Points to a custom cursor file
};
Vector<CursorShape> mCursors;
Vector<Cursor_Shape> mCursors;
/// The PlatformWindow that owns this Cursor Controller
PlatformWindow *mOwner;
@ -85,7 +85,7 @@ public:
virtual void setCursorVisible( bool visible ) = 0;
virtual bool isCursorVisible() = 0;
virtual void setCursorShape( const CursorShape &shape, bool reload );
virtual void setCursorShape( const Cursor_Shape &shape, bool reload );
virtual void setCursorShape( U32 cursorID ) = 0;
virtual void setCursorShape( const UTF8 *filename, bool reload ) = 0;
@ -99,4 +99,4 @@ public:
virtual S32 getDoubleClickHeight() = 0;
};
#endif
#endif