Merge pull request #158 from rmpowell77/dev/withWrap

Issue #157: Text needs withWrap
rmpowell77 · Nov 24, 2023 · 66a77bc · 66a77bc
2 parents e9939d1 + c8380e0
commit 66a77bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/LATEST_RELEASE_NOTES.md b/LATEST_RELEASE_NOTES.md
@@ -1,8 +1,8 @@
-# wxUI release notes for v0.1.8
+# wxUI release notes for v0.1.9
 
 Bugs addressed in this release:
 
-* [#154](../../issues/154) Generic constructor overload takes wxWindow, should have been Window
-
 Other changes:
 
+* [#157](../../issues/157) Text needs withWrap
+
diff --git a/include/wxUI/Text.h b/include/wxUI/Text.h
@@ -59,6 +59,12 @@ struct Text : public details::WidgetDetails<Text, wxStaticText> {
     {
     }
 
+    auto setWrap(int wrapLength) -> Text&
+    {
+        wrap = wrapLength;
+        return *this;
+    }
+
     struct Proxy : super::WidgetProxy {
         PROXY_BOILERPLATE();
 
@@ -78,10 +84,15 @@ struct Text : public details::WidgetDetails<Text, wxStaticText> {
 
 private:
     std::string text;
+    std::optional<int> wrap;
 
     auto createImpl(wxWindow* parent) -> wxWindow* override
     {
-        return setProxy(new underlying_t(parent, getIdentity(), text, getPos(), getSize(), getStyle()));
+        auto* widget = new underlying_t(parent, getIdentity(), text, getPos(), getSize(), getStyle());
+        if (wrap) {
+            widget->Wrap(*wrap);
+        }
+        return setProxy(widget);
     }
 };