Kaydet (Commit) 605d3a28 authored tarafından jan Iversen's avatar jan Iversen

iOS update for Rectangle

Updated Rectangle to tools::Rectangle

Change-Id: I1577dffe8d51ac3a33bbc2e0771b338d5fdd0220
üst e5b0183b
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
virtual SalSystem* CreateSalSystem() override; virtual SalSystem* CreateSalSystem() override;
void GetWorkArea( Rectangle& rRect ); void GetWorkArea( tools::Rectangle& rRect );
SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
}; };
......
...@@ -42,9 +42,9 @@ public: ...@@ -42,9 +42,9 @@ public:
virtual bool ErrorTrapPop( bool ) { return false; } virtual bool ErrorTrapPop( bool ) { return false; }
}; };
void IosSalInstance::GetWorkArea( Rectangle& rRect ) void IosSalInstance::GetWorkArea( tools::Rectangle& rRect )
{ {
rRect = Rectangle( Point( 0, 0 ), rRect = tools::Rectangle( Point( 0, 0 ),
Size( viewWidth, viewHeight ) ); Size( viewWidth, viewHeight ) );
} }
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT);
} }
virtual void GetWorkArea( Rectangle& rRect ) override virtual void GetWorkArea( tools::Rectangle& rRect ) override
{ {
IosSalInstance::getInstance()->GetWorkArea( rRect ); IosSalInstance::getInstance()->GetWorkArea( rRect );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment