aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/window_pair.h
diff options
context:
space:
mode:
authorPaul Gilbert2018-12-09 11:36:20 -0800
committerPaul Gilbert2018-12-09 11:36:20 -0800
commit7637edb5a2e84c0abbf1c1aa156772ce1f7906c3 (patch)
tree4c35ef8cf96ffd4148a19dafaf082a0209d0416a /engines/glk/window_pair.h
parent9809e19f48f750c79068baf3a0681c6a0233a083 (diff)
downloadscummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.gz
scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.bz2
scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.zip
GLK: Change all references to glui32 and glsi32 to uint and int
This should finally fix compilation for the Amiga, which had difference sized types. And the renamed types are clearer for ScummVM anyway
Diffstat (limited to 'engines/glk/window_pair.h')
-rw-r--r--engines/glk/window_pair.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/glk/window_pair.h b/engines/glk/window_pair.h
index b58819261c..ebd2d01ac0 100644
--- a/engines/glk/window_pair.h
+++ b/engines/glk/window_pair.h
@@ -35,18 +35,18 @@ public:
Window *_child1, *_child2;
// split info...
- glui32 _dir; ///< winmethod_Left, Right, Above, or Below
+ uint _dir; ///< winmethod_Left, Right, Above, or Below
bool _vertical, _backward; ///< flags
- glui32 _division; ///< winmethod_Fixed or winmethod_Proportional
+ uint _division; ///< winmethod_Fixed or winmethod_Proportional
Window *_key; ///< nullptr or a leaf-descendant (not a Pair)
int _keyDamage; ///< used as scratch space in window closing
- glui32 _size; ///< size value
+ uint _size; ///< size value
bool _wBorder; ///< If windows are separated by border
public:
/**
* Constructor
*/
- PairWindow(Windows *windows, glui32 method, Window *key, glui32 size);
+ PairWindow(Windows *windows, uint method, Window *key, uint size);
/**
* Destructor
@@ -63,9 +63,9 @@ public:
*/
virtual void redraw() override;
- virtual void getArrangement(glui32 *method, glui32 *size, Window **keyWin) override;
+ virtual void getArrangement(uint *method, uint *size, Window **keyWin) override;
- virtual void setArrangement(glui32 method, glui32 size, Window *keyWin) override;
+ virtual void setArrangement(uint method, uint size, Window *keyWin) override;
/**
* Click the window