4 files changed, 8 insertions, 4 deletions
diff --git a/include/cru/platform/basic_types.hpp b/include/cru/platform/basic_types.hpp
index 81ee3e34..e6ab4b59 100644
--- a/include/cru/platform/basic_types.hpp
+++ b/include/cru/platform/basic_types.hpp
@@ -1,3 +1,4 @@
+#pragma once
 #include "cru/common/pre_config.hpp"
 
 namespace cru::platform {
diff --git a/include/cru/platform/matrix.hpp b/include/cru/platform/matrix.hpp
index e5e5cf42..37e4725e 100644
--- a/include/cru/platform/matrix.hpp
+++ b/include/cru/platform/matrix.hpp
@@ -1,3 +1,4 @@
+#pragma once
 #include "cru/common/pre_config.hpp"
 
 #include "cru/common/ui_base.hpp"
@@ -29,12 +30,14 @@ struct Matrix {
            m31 == 0.0f && m32 == 0.0f;
   }
 
-  Matrix& operator*=(const Matrix& matrix) const {
+  Matrix& operator*=(const Matrix& matrix) {
     *this = Product(*this, matrix);
     return *this;
   }
 
-  Matrix operator*(const Matrix& matrix) const { return Product(this, matrix); }
+  Matrix operator*(const Matrix& matrix) const {
+    return Product(*this, matrix);
+  }
 
   ui::Point TransformPoint(const ui::Point& point) const {
     return ui::Point{point.x * m11 + point.y * m21 + m31,
diff --git a/include/cru/platform/painter.hpp b/include/cru/platform/painter.hpp
index eaaf61f9..b7b89fc9 100644
--- a/include/cru/platform/painter.hpp
+++ b/include/cru/platform/painter.hpp
@@ -19,7 +19,7 @@ struct Painter : virtual Interface {
   virtual void StrokeGeometry(Geometry* geometry, Brush* brush,
                               float width) = 0;
   virtual void FillGeometry(Geometry* geometry, Brush* brush) = 0;
-  virtual void DrawText(const ui::Point& offset, TextLayout* text_layout, Brush* brush);
+  virtual void DrawText(const ui::Point& offset, TextLayout* text_layout, Brush* brush) = 0;
   virtual void EndDraw() = 0;
   virtual bool IsDisposed() = 0;
 };
diff --git a/include/cru/platform/win/win_text_layout.hpp b/include/cru/platform/win/win_text_layout.hpp
index 9c93aa8c..dfb54264 100644
--- a/include/cru/platform/win/win_text_layout.hpp
+++ b/include/cru/platform/win/win_text_layout.hpp
@@ -17,7 +17,7 @@ class WinTextLayout : public Object, public virtual TextLayout {
   WinTextLayout(WinTextLayout&& other) = delete;
   WinTextLayout& operator=(const WinTextLayout& other) = delete;
   WinTextLayout& operator=(WinTextLayout&& other) = delete;
-  ~WinTextLayout() override;
+  ~WinTextLayout() override = default;
 
   std::wstring GetText() override;
   void SetText(std::wstring new_text) override;