...

4 files changed, 14 insertions, 12 deletions

diff --git a/include/cru/platform/native_window.hpp b/include/cru/platform/native_window.hpp
index 2daf4870..f68fd3a4 100644
--- a/include/cru/platform/native_window.hpp
+++ b/include/cru/platform/native_window.hpp
@@ -35,13 +35,13 @@ struct NativeWindow : public virtual Interface {
   virtual Painter* BeginPaint() = 0;
 
   virtual Event<>* DestroyEvent() = 0;
-  virtual Event<ui::Size>* ResizeEvent() = 0;
+  virtual Event<const ui::Size&>* ResizeEvent() = 0;
   virtual Event<>* PaintEvent() = 0;
   virtual Event<bool>* FocusEvent() = 0;
   virtual Event<bool>* MouseEnterLeaveEvent() = 0;
-  virtual Event<ui::Point>* MouseMoveEvent() = 0;
-  virtual Event<MouseButton, ui::Point>* MouseDownEvent() = 0;
-  virtual Event<MouseButton, ui::Point>* MouseUpEvent() = 0;
+  virtual Event<const ui::Point&>* MouseMoveEvent() = 0;
+  virtual Event<MouseButton, const ui::Point&>* MouseDownEvent() = 0;
+  virtual Event<MouseButton, const ui::Point&>* MouseUpEvent() = 0;
   virtual Event<int>* KeyDownEvent() = 0;
   virtual Event<int>* KeyUpEvent() = 0;
 };
diff --git a/include/cru/platform/painter.hpp b/include/cru/platform/painter.hpp
index 7310bc5c..eaaf61f9 100644
--- a/include/cru/platform/painter.hpp
+++ b/include/cru/platform/painter.hpp
@@ -12,6 +12,7 @@ struct TextLayout;
 struct Painter : virtual Interface {
   virtual Matrix GetTransform() = 0;
   virtual void SetTransform(const Matrix& matrix) = 0;
+  virtual void Clear(const ui::Color& color) = 0;
   virtual void StrokeRectangle(const ui::Rect& rectangle, Brush* brush,
                                float width) = 0;
   virtual void FillRectangle(const ui::Rect& rectangle, Brush* brush) = 0;
diff --git a/include/cru/platform/win/win_native_window.hpp b/include/cru/platform/win/win_native_window.hpp
index ae19c9f3..7b93fd5c 100644
--- a/include/cru/platform/win/win_native_window.hpp
+++ b/include/cru/platform/win/win_native_window.hpp
@@ -47,17 +47,17 @@ class WinNativeWindow : public Object, public virtual NativeWindow {
   Painter* BeginPaint() override;
 
   Event<>* DestroyEvent() override { return &destroy_event_; }
-  Event<ui::Size>* ResizeEvent() override { return &resize_event_; }
+  Event<const ui::Size&>* ResizeEvent() override { return &resize_event_; }
   Event<>* PaintEvent() override { return &paint_event_; }
   Event<bool>* FocusEvent() override { return &focus_event_; }
   Event<bool>* MouseEnterLeaveEvent() override {
     return &mouse_enter_leave_event_;
   }
-  Event<ui::Point>* MouseMoveEvent() override { return &mouse_move_event_; }
-  Event<MouseButton, ui::Point>* MouseDownEvent() override {
+  Event<const ui::Point&>* MouseMoveEvent() override { return &mouse_move_event_; }
+  Event<MouseButton, const ui::Point&>* MouseDownEvent() override {
     return &mouse_down_event_;
   }
-  Event<MouseButton, ui::Point>* MouseUpEvent() override {
+  Event<MouseButton, const ui::Point&>* MouseUpEvent() override {
     return &mouse_up_event_;
   }
   Event<int>* KeyDownEvent() override { return &key_down_event_; }
@@ -117,13 +117,13 @@ class WinNativeWindow : public Object, public virtual NativeWindow {
   std::shared_ptr<WindowRenderTarget> window_render_target_;
 
   Event<> destroy_event_;
-  Event<ui::Size> resize_event_;
+  Event<const ui::Size&> resize_event_;
   Event<> paint_event_;
   Event<bool> focus_event_;
   Event<bool> mouse_enter_leave_event_;
-  Event<ui::Point> mouse_move_event_;
-  Event<MouseButton, ui::Point> mouse_down_event_;
-  Event<MouseButton, ui::Point> mouse_up_event_;
+  Event<const ui::Point&> mouse_move_event_;
+  Event<MouseButton, const ui::Point&> mouse_down_event_;
+  Event<MouseButton, const ui::Point&> mouse_up_event_;
   Event<int> key_down_event_;
   Event<int> key_up_event_;
 
diff --git a/include/cru/platform/win/win_painter.hpp b/include/cru/platform/win/win_painter.hpp
index dfb981d5..3c37ccb2 100644
--- a/include/cru/platform/win/win_painter.hpp
+++ b/include/cru/platform/win/win_painter.hpp
@@ -17,6 +17,7 @@ class WinPainter : public Object, public virtual Painter {
 
   Matrix GetTransform() override;
   void SetTransform(const Matrix& matrix) override;
+  void Clear(const ui::Color& color) override;
   void StrokeRectangle(const ui::Rect& rectangle, Brush* brush,
                                float width) override;
   void FillRectangle(const ui::Rect& rectangle, Brush* brush) override;