diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-04-14 05:15:22 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-04-14 05:15:22 +0200 |
commit | de184d0999018e598daae7cd872b181ca92f5a31 (patch) | |
tree | e009f5d15e636c3c018ba504cffe66f3a7c6842f /Servers/WindowServer/WSMenu.h | |
parent | 4132f645ee7918fe82e835ee5b7f66f222ef5982 (diff) | |
download | serenity-de184d0999018e598daae7cd872b181ca92f5a31.zip |
WindowServer: Port WindowServer to LibCore.
This was pretty straightforward thanks to the work I did separating out
LibCore from LibGUI already. :^)
- WSMessageLoop now inherits from CEventLoop.
- WSMessage now inherits from CEvent.
- WSMessageReceiver goes away.
Now there is only one event loop in Serenity. Very nice!
Diffstat (limited to 'Servers/WindowServer/WSMenu.h')
-rw-r--r-- | Servers/WindowServer/WSMenu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h index 03bbfc9c65..e6ff65282f 100644 --- a/Servers/WindowServer/WSMenu.h +++ b/Servers/WindowServer/WSMenu.h @@ -5,7 +5,7 @@ #include <AK/WeakPtr.h> #include <SharedGraphics/Rect.h> #include <WindowServer/WSMenuItem.h> -#include <WindowServer/WSMessageReceiver.h> +#include <LibCore/CObject.h> class WSClientConnection; class WSMenuBar; @@ -13,7 +13,7 @@ class WSMessage; class WSWindow; class Font; -class WSMenu final : public WSMessageReceiver { +class WSMenu final : public CObject { public: WSMenu(WSClientConnection*, int menu_id, String&& name); virtual ~WSMenu() override; @@ -77,7 +77,7 @@ public: void popup(const Point&); private: - virtual void on_message(const WSMessage&) override; + virtual void event(CEvent&) override; int padding_between_text_and_shortcut() const { return 50; } void did_activate(WSMenuItem&); |