Merge pull request #806 from wsu-cb/fix-growable-rows-cols

Fix wxFlexGridSizer XRC output of growablerows and growablecols These properties are not simple integers but a list type data structure. The wxFB format is identical to the XRC format so these can be passed as-is.
wxFormBuilder · Feb 19, 2024 · 2d39f8c · 2d39f8c
2 parents bb4cf58 + 69ce2c9
commit 2d39f8c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/plugins/layout/layout.cpp b/plugins/layout/layout.cpp
@@ -320,8 +320,8 @@ class FlexGridSizerBase : public ComponentBase
         }
         filter.AddProperty(XrcFilter::Type::Integer, "vgap");
         filter.AddProperty(XrcFilter::Type::Integer, "hgap");
-        filter.AddProperty(XrcFilter::Type::Integer, "growablerows");
-        filter.AddProperty(XrcFilter::Type::Integer, "growablecols");
+        filter.AddProperty(XrcFilter::Type::Text, "growablerows");
+        filter.AddProperty(XrcFilter::Type::Text, "growablecols");
         return xrc;
     }
 
@@ -331,8 +331,8 @@ class FlexGridSizerBase : public ComponentBase
         filter.AddProperty(XrcFilter::Type::Size, "minsize", "minimum_size");
         filter.AddProperty(XrcFilter::Type::Integer, "vgap");
         filter.AddProperty(XrcFilter::Type::Integer, "hgap");
-        filter.AddProperty(XrcFilter::Type::Integer, "growablerows");
-        filter.AddProperty(XrcFilter::Type::Integer, "growablecols");
+        filter.AddProperty(XrcFilter::Type::Text, "growablerows");
+        filter.AddProperty(XrcFilter::Type::Text, "growablecols");
         return xfb;
     }
 };