From 6c59a314569100181b792944a86a3781146c91c7 Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 8 Sep 2021 12:22:05 +0100 Subject: [PATCH] Win32 Windowing: Fix uninitialised data members warning --- examples/GUI/AccessibilityDemo.h | 32 +++++++++---------- .../native/juce_win32_Windowing.cpp | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/GUI/AccessibilityDemo.h b/examples/GUI/AccessibilityDemo.h index 50d27fc3b6..45529e6693 100644 --- a/examples/GUI/AccessibilityDemo.h +++ b/examples/GUI/AccessibilityDemo.h @@ -174,10 +174,10 @@ public: grid.templateRows = { Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (2)) }; grid.templateColumns = { Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (1)) }; - grid.items = { GridItem (descriptionLabel).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + grid.items = { GridItem (descriptionLabel).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (buttons).withMargin ({ 2 }), GridItem (sliders).withMargin ({ 2 }), - GridItem (treeView).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }) }; + GridItem (treeView).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }) }; grid.performLayout (getLocalBounds()); } @@ -288,7 +288,7 @@ private: Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (1)) }; - grid.items = { GridItem (horizontalSlider).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + grid.items = { GridItem (horizontalSlider).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (incDecSlider).withMargin ({ 2 }) }; for (auto& rotary : rotarySliders) @@ -464,8 +464,8 @@ public: grid.templateColumns = { Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (1)) }; - grid.items = { GridItem (descriptionLabel).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), - GridItem (infoComponent).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + grid.items = { GridItem (descriptionLabel).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), + GridItem (infoComponent).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (actionsComponent).withMargin ({ 2 }), GridItem (valueInterfaceComponent).withMargin ({ 2 }), GridItem (stateComponent).withMargin ({ 2 }), @@ -581,16 +581,16 @@ private: Grid::TrackInfo (Grid::Fr (1)) }; grid.items = { GridItem (titleLabel).withMargin ({ 2 }), - GridItem (titleEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + GridItem (titleEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (roleLabel).withMargin ({ 2 }), - GridItem (roleBox).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + GridItem (roleBox).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (descriptionLabel).withMargin ({ 2 }), - GridItem (descriptionEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }), + GridItem (descriptionEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }), GridItem (helpLabel).withMargin ({ 2 }), - GridItem (helpEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2) }) }; + GridItem (helpEditor).withMargin ({ 2 }).withColumn ({ GridItem::Span (2), {} }) }; grid.performLayout (getLocalBounds()); } @@ -802,7 +802,7 @@ private: }(); grid.items = { GridItem (valueTypeBox).withMargin (2), GridItem (readOnlyToggle).withMargin (2), - GridItem (valueEditComponent).withMargin (2).withColumn ({ GridItem::Span (2) }), }; + GridItem (valueEditComponent).withMargin (2).withColumn ({ GridItem::Span (2), {} }), }; grid.performLayout (getLocalBounds()); } @@ -906,7 +906,7 @@ private: grid.items = { GridItem (minLabel).withMargin (2), GridItem (maxLabel).withMargin (2), GridItem (intervalLabel).withMargin (2), GridItem (minValueEditor).withMargin (2), GridItem (maxValueEditor).withMargin (2), GridItem (intervalValueEditor).withMargin (2), - GridItem (valueSlider).withMargin (2).withColumn ({ GridItem::Span (3) }) }; + GridItem (valueSlider).withMargin (2).withColumn ({ GridItem::Span (3), {} }) }; grid.performLayout (getLocalBounds()); } @@ -1279,11 +1279,11 @@ private: Grid::TrackInfo (Grid::Fr (1)), Grid::TrackInfo (Grid::Fr (1)) }; - grid.items = { GridItem (titleLabel).withMargin (2).withColumn ({ GridItem::Span (4) }), - GridItem (focusableToggle).withMargin (2).withColumn ({ GridItem::Span (2) }), - GridItem (defaultToggle).withMargin (2).withColumn ({ GridItem::Span (2) }), + grid.items = { GridItem (titleLabel).withMargin (2).withColumn ({ GridItem::Span (4), {} }), + GridItem (focusableToggle).withMargin (2).withColumn ({ GridItem::Span (2), {} }), + GridItem (defaultToggle).withMargin (2).withColumn ({ GridItem::Span (2), {} }), GridItem (orderLabel).withMargin (2), - GridItem (orderBox).withMargin (2).withColumn ({ GridItem::Span (3) }) }; + GridItem (orderBox).withMargin (2).withColumn ({ GridItem::Span (3), {} }) }; grid.performLayout (getLocalBounds()); } @@ -1403,7 +1403,7 @@ public: grid.templateColumns = { Grid::TrackInfo (Grid::Fr (3)), Grid::TrackInfo (Grid::Fr (2)) }; - grid.items = { GridItem (descriptionLabel).withMargin (2).withColumn ({ GridItem::Span (2) }), + grid.items = { GridItem (descriptionLabel).withMargin (2).withColumn ({ GridItem::Span (2), {} }), GridItem (textEntryBox).withMargin (2).withArea ({ 2 }, { 1 }, { 5 }, { 2 }), GridItem (priorityComboBox).withMargin (2).withArea ({ 5 }, { 1 }, { 6 }, { 2 }), GridItem (announceButton).withMargin (2).withArea ({ 4 }, { 2 }, { 5 }, { 3 }) }; diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 14b47eefa0..d361b848a1 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -4541,7 +4541,7 @@ public: int getResult() override { - TASKDIALOGCONFIG config = { 0 }; + TASKDIALOGCONFIG config{}; config.cbSize = sizeof (config); config.pszWindowTitle = title.toWideCharPointer();