diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 408caa6787..69d4e845ca 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -2251,8 +2251,8 @@ class-specific properties. All classes support the following properties:
 
 @beginTable
 @hdr3col{property, type, description}
-@row3col{rows, integer, Number of rows in the grid (default: 0 - determine automatically).}
-@row3col{cols, integer, Number of columns in the grid (default: 0 - determine automatically).}
+@row3col{rows, unsigned integer, Number of rows in the grid (default: 0 - determine automatically).}
+@row3col{cols, unsigned integer, Number of columns in the grid (default: 0 - determine automatically).}
 @row3col{vgap, @ref overview_xrcformat_type_dimension, Vertical gap between children (default: 0).}
 @row3col{hgap, @ref overview_xrcformat_type_dimension, Horizontal gap between children (default: 0).}
 @endTable
@@ -2261,8 +2261,8 @@ class-specific properties. All classes support the following properties:
 
 @beginTable
 @hdr3col{property, type, description}
-@row3col{rows, integer, Number of rows in the grid (default: 0 - determine automatically).}
-@row3col{cols, integer, Number of columns in the grid (default: 0 - determine automatically).}
+@row3col{rows, unsigned integer, Number of rows in the grid (default: 0 - determine automatically).}
+@row3col{cols, unsigned integer, Number of columns in the grid (default: 0 - determine automatically).}
 @row3col{vgap, @ref overview_xrcformat_type_dimension, Vertical gap between children (default: 0).}
 @row3col{hgap, @ref overview_xrcformat_type_dimension, Horizontal gap between children (default: 0).}
 @row3col{flexibledirection, @ref overview_xrcformat_type_style,
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index 6152db0ea8..5ee0d91290 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -397,6 +397,7 @@ t_text       = string
 t_string     = string
 t_bool       = "1" | "0"
 t_integer    = xsd:integer
+t_unsigned   = xsd:nonNegativeInteger
 t_float      = xsd:float
 t_direction  = "wxLEFT" | "wxRIGHT" | "wxTOP" | "wxBOTTOM"
 t_style      = xsd:string { pattern = "(wx[A-Z0-9_]+)( *\| *(wx[A-Z0-9_]+))*" }
@@ -1524,8 +1525,8 @@ wxGridSizer =
         attribute class { "wxGridSizer" } &
         stdObjectNodeAttributes &
         [xrc:p="o"] element minsize {_, t_size }* &
-        [xrc:p="o"] element rows    {_, t_integer }* &
-        [xrc:p="o"] element cols    {_, t_integer }* &
+        [xrc:p="o"] element rows    {_, t_unsigned }* &
+        [xrc:p="o"] element cols    {_, t_unsigned }* &
         [xrc:p="o"] element vgap    {_, t_dimension }* &
         [xrc:p="o"] element hgap    {_, t_dimension }* &
         (wxSizer_item | objectRef)*
@@ -1536,8 +1537,8 @@ wxFlexGridSizer =
         attribute class { "wxFlexGridSizer" } &
         stdObjectNodeAttributes &
         [xrc:p="o"] element minsize             {_, t_size }* &
-        [xrc:p="o"] element rows                {_, t_integer }* &
-        [xrc:p="o"] element cols                {_, t_integer }* &
+        [xrc:p="o"] element rows                {_, t_unsigned }* &
+        [xrc:p="o"] element cols                {_, t_unsigned }* &
         [xrc:p="o"] element vgap                {_, t_dimension }* &
         [xrc:p="o"] element hgap                {_, t_dimension }* &
         [xrc:p="o"] element flexibledirection   {_, ("wxVERTICAL" | "wxHORIZONTAL" | "wxBOTH") }* &