2 files changed, 7 insertions, 2 deletions
diff --git a/include/cru/osx/graphics/quartz/TextLayout.hpp b/include/cru/osx/graphics/quartz/TextLayout.hpp
index 96aabf90..4d23a76e 100644
--- a/include/cru/osx/graphics/quartz/TextLayout.hpp
+++ b/include/cru/osx/graphics/quartz/TextLayout.hpp
@@ -22,7 +22,7 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
   String GetText() override { return text_; }
   void SetText(String new_text) override;
 
-  std::shared_ptr<IFont> GetFont() override;
+  std::shared_ptr<IFont> GetFont() override { return font_; }
   void SetFont(std::shared_ptr<IFont> font) override;
 
   void SetMaxWidth(float max_width) override;
@@ -33,7 +33,7 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
   Point TextSinglePoint(Index position, bool trailing) override;
   TextHitTestResult HitTest(const Point& point) override;
 
-private:
+ private:
   void RecreateFrame();
 
  private:
diff --git a/include/cru/osx/gui/UiApplication.hpp b/include/cru/osx/gui/UiApplication.hpp
index 5de0cc6b..a7b88010 100644
--- a/include/cru/osx/gui/UiApplication.hpp
+++ b/include/cru/osx/gui/UiApplication.hpp
@@ -6,12 +6,15 @@
 #include <memory>
 
 namespace cru::platform::gui::osx {
+class OsxWindow;
+
 namespace details {
 class OsxUiApplicationPrivate;
 }
 
 class OsxUiApplication : public OsxGuiResource, public virtual IUiApplication {
   friend details::OsxUiApplicationPrivate;
+  friend OsxWindow;
 
  public:
   OsxUiApplication();
@@ -44,6 +47,8 @@ class OsxUiApplication : public OsxGuiResource, public virtual IUiApplication {
   ICursorManager* GetCursorManager() override;
 
  private:
+  void UnregisterWindow(OsxWindow* window);
+
   std::unique_ptr<details::OsxUiApplicationPrivate> p_;
 };
 }  // namespace cru::platform::gui::osx