Issue #70: Widget::style() is odd, it should be withStyle()

rmpowell77 · Feb 1, 2023 · 2a17f16 · 2a17f16
1 parent 79e2b51
commit 2a17f16
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 22 deletions.
diff --git a/LATEST_RELEASE_NOTES.md b/LATEST_RELEASE_NOTES.md
@@ -4,6 +4,11 @@ Bugs addressed in this release:
 
 Other changes:
 
+* [#55](../../issues/55) Layout::Generic should take wxWindow also
+* [#56](../../issues/56) Need Line
+* [#57](../../issues/56) Need Slider
 * [#58](../../issues/58) Need SpinCtrl Controller
 * [#59](../../issues/59) need BitmapToggleButton
+* [#65](../../issues/65) Custom controller should take a coroutine that generates wxWindows to be added to the sizer
+* [#70](../../issues/70) Widget::style() is odd, it should be withStyle()
 
diff --git a/README.md b/README.md
@@ -24,16 +24,16 @@ ExampleDialog::ExampleDialog(wxWindow* parent)
             "Text examples",
             Text { "Example of Text in wxUI" },
             TextCtrl { "Single line of text" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
             TextCtrl {
                 "Several lines of text.\n"
                 "With wxUI the code reflects\n"
                 "what the UI looks like." }
-                .style(wxTE_MULTILINE)
+                .withStyle(wxTE_MULTILINE)
                 .withSize(wxSize(200, 100))
         },
         RadioBox { "&Log Levels:", { "&Information", "&Warning", "&Error", "&None", "&Custom" } }
-            .style(wxRA_SPECIFY_ROWS)
+            .withStyle(wxRA_SPECIFY_ROWS)
             .majorDim(1)
             .withSelection(1),
 
@@ -42,7 +42,7 @@ ExampleDialog::ExampleDialog(wxWindow* parent)
             CheckBox { "Show" },
             Choice { { "Less", "More" } },
             TextCtrl { wxSizerFlags(1).Expand().Border(), "Fill in the blank" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
         },
 
         HStack {
@@ -109,7 +109,7 @@ ExampleDialog::ExampleDialog(wxWindow* parent)
             "Text examples",
             Text { "Example of Text in wxUI" },
             TextCtrl { "Single line of text" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
     // ...
         },
     // ...

diff --git a/docs/ProgrammersGuide.md b/docs/ProgrammersGuide.md
@@ -146,7 +146,7 @@ One special type of "Layout" is `Generic`.  There are cases where you may have a
             CheckBox { "Show" },
             Choice { { "Less", "More" } },
             TextCtrl { wxSizerFlags(1).Expand().Border(), "Fill in the blank" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
         },
 ```
 

diff --git a/examples/HelloWorld/HelloWorld.cpp b/examples/HelloWorld/HelloWorld.cpp
@@ -240,19 +240,19 @@ ExampleDialog::ExampleDialog(wxWindow* parent)
             // endsnippet wxUILayoutBasic
             Text { "Example of Text in wxUI" },
             TextCtrl { "Single line of text" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
             // endsnippet withwxUI
             TextCtrl {
                 "Several lines of text.\n"
                 "With wxUI the code reflects\n"
                 "what the UI looks like." }
-                .style(wxTE_MULTILINE)
+                .withStyle(wxTE_MULTILINE)
                 .withSize(wxSize(200, 100))
             // snippet withwxUI
         },
         // endsnippet withwxUI
         RadioBox { "&Log Levels:", { "&Information", "&Warning", "&Error", "&None", "&Custom" } }
-            .style(wxRA_SPECIFY_ROWS)
+            .withStyle(wxRA_SPECIFY_ROWS)
             .majorDim(1)
             .withSelection(1),
 
@@ -262,7 +262,7 @@ ExampleDialog::ExampleDialog(wxWindow* parent)
             CheckBox { "Show" },
             Choice { { "Less", "More" } },
             TextCtrl { wxSizerFlags(1).Expand().Border(), "Fill in the blank" }
-                .style(wxALIGN_LEFT),
+                .withStyle(wxALIGN_LEFT),
         },
         // endsnippet wxUIController
 

diff --git a/include/wxUI/Line.h b/include/wxUI/Line.h
@@ -55,12 +55,12 @@ struct Line : public details::WidgetDetails<Line, wxStaticLine> {
 
 inline auto HLine() -> Line
 {
-    return Line(wxSizerFlags {}.Border(wxALL, 2).Proportion(1).Expand()).style(wxLI_HORIZONTAL);
+    return Line(wxSizerFlags {}.Border(wxALL, 2).Proportion(1).Expand()).withStyle(wxLI_HORIZONTAL);
 }
 
 inline auto VLine() -> Line
 {
-    return Line(wxSizerFlags {}.Border(wxALL, 2).Proportion(1).Expand()).style(wxLI_VERTICAL);
+    return Line(wxSizerFlags {}.Border(wxALL, 2).Proportion(1).Expand()).withStyle(wxLI_VERTICAL);
 }
 
 static_assert(details::Widget<Line>);

diff --git a/include/wxUI/Widget.h b/include/wxUI/Widget.h
@@ -130,7 +130,7 @@ struct WidgetDetails {
         return static_cast<ConcreteWidget&>(*this);
     }
 
-    auto style(int64_t style) -> ConcreteWidget&
+    auto withStyle(int64_t style) -> ConcreteWidget&
     {
         usingStyle = style;
         return static_cast<ConcreteWidget&>(*this);

diff --git a/tests/wxUI_BitmapButtonTests.cpp b/tests/wxUI_BitmapButtonTests.cpp
@@ -81,7 +81,7 @@ TEST_CASE("BitmapButton")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest { wxBitmap {} }.style(wxBU_LEFT);
+        auto uut = TypeUnderTest { wxBitmap {} }.withStyle(wxBU_LEFT);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == (wxBU_LEFT | wxBU_EXACTFIT | wxBU_NOTEXT));
     }

diff --git a/tests/wxUI_ButtonTests.cpp b/tests/wxUI_ButtonTests.cpp
@@ -122,7 +122,7 @@ TEST_CASE("Button")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxBU_LEFT);
+        auto uut = TypeUnderTest {}.withStyle(wxBU_LEFT);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == wxBU_LEFT);
     }

diff --git a/tests/wxUI_CheckBoxTests.cpp b/tests/wxUI_CheckBoxTests.cpp
@@ -109,7 +109,7 @@ TEST_CASE("CheckBox")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxCHK_3STATE);
+        auto uut = TypeUnderTest {}.withStyle(wxCHK_3STATE);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == wxCHK_3STATE);
     }

diff --git a/tests/wxUI_ChoiceTests.cpp b/tests/wxUI_ChoiceTests.cpp
@@ -133,7 +133,7 @@ TEST_CASE("Choice")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxCB_SORT);
+        auto uut = TypeUnderTest {}.withStyle(wxCB_SORT);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == wxCB_SORT);
     }

diff --git a/tests/wxUI_ListBoxTests.cpp b/tests/wxUI_ListBoxTests.cpp
@@ -133,7 +133,7 @@ TEST_CASE("ListBox")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxLB_MULTIPLE);
+        auto uut = TypeUnderTest {}.withStyle(wxLB_MULTIPLE);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == (wxBORDER_SUNKEN | wxLB_MULTIPLE));
     }

diff --git a/tests/wxUI_RadioBoxTests.cpp b/tests/wxUI_RadioBoxTests.cpp
@@ -134,7 +134,7 @@ TEST_CASE("RadioBox")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest { std::vector<wxString> { "Hello", "Goodbye" } }.style(wxRA_SPECIFY_COLS);
+        auto uut = TypeUnderTest { std::vector<wxString> { "Hello", "Goodbye" } }.withStyle(wxRA_SPECIFY_COLS);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == (wxRA_SPECIFY_COLS | wxTAB_TRAVERSAL));
     }

diff --git a/tests/wxUI_SpinCtrlTests.cpp b/tests/wxUI_SpinCtrlTests.cpp
@@ -135,7 +135,7 @@ TEST_CASE("SpinCtrl")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxTE_PROCESS_ENTER);
+        auto uut = TypeUnderTest {}.withStyle(wxTE_PROCESS_ENTER);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == (wxTE_PROCESS_ENTER | wxTAB_TRAVERSAL | 0x200000));
     }

diff --git a/tests/wxUI_Text.cpp b/tests/wxUI_Text.cpp
@@ -108,7 +108,7 @@ TEST_CASE("Text")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxST_ELLIPSIZE_MIDDLE);
+        auto uut = TypeUnderTest {}.withStyle(wxST_ELLIPSIZE_MIDDLE);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == wxST_ELLIPSIZE_MIDDLE);
     }

diff --git a/tests/wxUI_TextCtrl.cpp b/tests/wxUI_TextCtrl.cpp
@@ -108,7 +108,7 @@ TEST_CASE("TextCtrl")
     SECTION("style")
     {
         wxFrame frame { nullptr, wxID_ANY, "" };
-        auto uut = TypeUnderTest {}.style(wxTE_PROCESS_ENTER);
+        auto uut = TypeUnderTest {}.withStyle(wxTE_PROCESS_ENTER);
         auto* window = dynamic_cast<TypeUnderTest::underlying_t*>(uut.create(&frame));
         CHECK(window->GetWindowStyle() == (wxBORDER_SUNKEN | wxTE_PROCESS_ENTER));
     }