diff options
Diffstat (limited to 'include/cru/win/gui')
| -rw-r--r-- | include/cru/win/gui/GodWindow.hpp | 1 | ||||
| -rw-r--r-- | include/cru/win/gui/InputMethod.hpp | 2 | ||||
| -rw-r--r-- | include/cru/win/gui/UiApplication.hpp | 10 | ||||
| -rw-r--r-- | include/cru/win/gui/Window.hpp | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/include/cru/win/gui/GodWindow.hpp b/include/cru/win/gui/GodWindow.hpp index 0343b159..d9a128e6 100644 --- a/include/cru/win/gui/GodWindow.hpp +++ b/include/cru/win/gui/GodWindow.hpp @@ -3,6 +3,7 @@ #include "WindowNativeMessageEventArgs.hpp" #include "cru/common/Event.hpp" +#include "cru/common/String.hpp" #include <memory> diff --git a/include/cru/win/gui/InputMethod.hpp b/include/cru/win/gui/InputMethod.hpp index 51a007d8..df687617 100644 --- a/include/cru/win/gui/InputMethod.hpp +++ b/include/cru/win/gui/InputMethod.hpp @@ -65,7 +65,7 @@ class WinInputMethodContext : public WinNativeResource, IEvent<std::nullptr_t>* CompositionEvent() override; - IEvent<std::u16string_view>* TextEvent() override; + IEvent<StringView>* TextEvent() override; private: void OnWindowNativeMessage(WindowNativeMessageEventArgs& args); diff --git a/include/cru/win/gui/UiApplication.hpp b/include/cru/win/gui/UiApplication.hpp index 4cf46858..daf72795 100644 --- a/include/cru/win/gui/UiApplication.hpp +++ b/include/cru/win/gui/UiApplication.hpp @@ -7,7 +7,7 @@ #include <memory> namespace cru::platform::graphics::win::direct { -class DirectGraphFactory; +class DirectGraphicsFactory; } namespace cru::platform::gui::win { @@ -41,11 +41,11 @@ class WinUiApplication : public WinNativeResource, void CancelTimer(long long id) override; std::vector<INativeWindow*> GetAllWindow() override; - INativeWindow* CreateWindow(INativeWindow* parent, CreateWindowFlag flag) override; + INativeWindow* CreateWindow() override; - cru::platform::graphics::IGraphFactory* GetGraphFactory() override; + cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory() override; - cru::platform::graphics::win::direct::DirectGraphFactory* GetDirectFactory() { + cru::platform::graphics::win::direct::DirectGraphicsFactory* GetDirectFactory() { return graph_factory_.get(); } @@ -60,7 +60,7 @@ class WinUiApplication : public WinNativeResource, private: HINSTANCE instance_handle_; - std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphFactory> + std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphicsFactory> graph_factory_; std::unique_ptr<GodWindow> god_window_; diff --git a/include/cru/win/gui/Window.hpp b/include/cru/win/gui/Window.hpp index 97a74fa7..9f241b0a 100644 --- a/include/cru/win/gui/Window.hpp +++ b/include/cru/win/gui/Window.hpp @@ -2,7 +2,6 @@ #include "Resource.hpp" #include "WindowNativeMessageEventArgs.hpp" -#include "cru/platform/GraphBase.hpp" #include "cru/platform/gui/Base.hpp" #include "cru/platform/gui/Window.hpp" #include "cru/win/graphics/direct/WindowRenderTarget.hpp" @@ -27,8 +26,6 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow { WinNativeWindow* GetParent() override { return parent_window_; } - bool IsVisible() override; - void SetVisible(bool is_visible) override; Size GetClientSize() override; void SetClientSize(const Size& size) override; |
