diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/gui/gui.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/gui.h')
| -rw-r--r-- | src/gui/gui.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/gui.h b/src/gui/gui.h index 033a71282..5fddc7df7 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -147,8 +147,9 @@ class Gui final : public gcn::Gui MouseEvent *createMouseEvent(Window *const widget) A_WARN_UNUSED; - void getAbsolutePosition(gcn::Widget *restrict widget, - int &restrict x, int &restrict y); + static void getAbsolutePosition(gcn::Widget *restrict widget, + int &restrict x, + int &restrict y); void addGlobalFocusListener(gcn::FocusListener* focusListener); @@ -164,7 +165,7 @@ class Gui final : public gcn::Gui int getLastMouseY() const { return mLastMouseY; } - uint32_t getMouseState(int *const x, int *const y) const; + static uint32_t getMouseState(int *const x, int *const y); protected: void handleMouseMoved(const gcn::MouseInput &mouseInput); |