diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_base.bin b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_base.bin
index 20099a66..5908786d 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_base.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_base.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_filter.bin b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_filter.bin
index ff344a14..d9abb470 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_filter.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_filter.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_plaintext.bin b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_plaintext.bin
index 57918e54..c1310a5e 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_plaintext.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_plaintext.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_sorter.bin b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_sorter.bin
index 5ff759a4..4b2acf29 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_sorter.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_sorter.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_visualizer.bin b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_visualizer.bin
new file mode 100644
index 00000000..0ec578e0
Binary files /dev/null and b/SampleForDoc/GacUI/UIRes/32bits/control_datagrid_visualizer.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_base.bin b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_base.bin
index c5a4219e..84849d0d 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_base.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_base.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_filter.bin b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_filter.bin
index 579bf599..133ca59b 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_filter.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_filter.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_plaintext.bin b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_plaintext.bin
index ddf1dc4b..da8d7166 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_plaintext.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_plaintext.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_sorter.bin b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_sorter.bin
index 6f770cb9..24fad295 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_sorter.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_sorter.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_visualizer.bin b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_visualizer.bin
new file mode 100644
index 00000000..7cbb38ea
Binary files /dev/null and b/SampleForDoc/GacUI/UIRes/64bits/control_datagrid_visualizer.bin differ
diff --git a/SampleForDoc/GacUI/XmlRes/control_datagrid_base/Resource.xml b/SampleForDoc/GacUI/XmlRes/control_datagrid_base/Resource.xml
index a10b7a9f..c7f00838 100644
--- a/SampleForDoc/GacUI/XmlRes/control_datagrid_base/Resource.xml
+++ b/SampleForDoc/GacUI/XmlRes/control_datagrid_base/Resource.xml
@@ -54,6 +54,7 @@
           @cpp:Private
           var iconOpen32: ImageData^ = null;
 
+          prop DataGrid : BindableDataGrid* = null {const, not observe}
           prop TitleColumn : DataColumn^ = null {const, not observe}
           prop AuthorColumn : DataColumn^ = null {const, not observe}
           prop DatePublishedColumn : DataColumn^ = null {const, not observe}
@@ -83,6 +84,7 @@
               self.books.Add(book);
             }
 
+            SetDataGrid(datagrid);
             SetTitleColumn(columnTitle);
             SetAuthorColumn(columnAuthor);
             SetDatePublishedColumn(columnDatePublished);
diff --git a/SampleForDoc/GacUI/XmlRes/control_datagrid_visualizer/Resource.xml b/SampleForDoc/GacUI/XmlRes/control_datagrid_visualizer/Resource.xml
new file mode 100644
index 00000000..f038d2b0
--- /dev/null
+++ b/SampleForDoc/GacUI/XmlRes/control_datagrid_visualizer/Resource.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Resource>
+  <Folder name="GacGenConfig">
+    <Xml name="Metadata">
+      <ResourceMetadata Name="DataGridVisualizer" Version="1.0">
+        <Dependencies>
+          <Resource Name="DataGridBase"/>
+        </Dependencies>
+      </ResourceMetadata>
+    </Xml>
+    <Folder name="ResX86">
+      <Text name="Resource">..\..\UIRes\32bits\control_datagrid_visualizer.bin</Text>
+    </Folder>
+    <Folder name="ResX64">
+      <Text name="Resource">..\..\UIRes\64bits\control_datagrid_visualizer.bin</Text>
+    </Folder>
+  </Folder>
+  <Folder name="MainWindow">
+    <Instance name="MainWindowResource">
+      <Instance ref.Class="sample::MainWindow" xmlns:sample="sample::*">
+        <sample:DataGridWindowBase ref.Name="self" Text="control_datagrid_visualizer" env.ItemType="sample::BookItem^">
+          <MessageDialog ref.Name="messageDialog" Title-bind="self.Text"/>
+          <att.DataGrid-set>
+            <ev.ItemLeftButtonUp-eval><![CDATA[
+              {
+                var cell = self.DataGrid.SelectedCell;
+                if (cell.row != -1 and cell.column == 1)
+                {
+                  messageDialog.Text = (cast (BookItem^) self.DataGrid.SelectedRowValue).Author;
+                  messageDialog.ShowDialog();
+                }
+              }
+            ]]></ev.ItemLeftButtonUp-eval>
+          </att.DataGrid-set>
+          <att.AuthorColumn-set>
+            <att.VisualizerFactory>HyperlinkVisualizerTemplate;FocusRectangleVisualizerTemplate;CellBorderVisualizerTemplate</att.VisualizerFactory>
+          </att.AuthorColumn-set>
+        </sample:DataGridWindowBase>
+      </Instance>
+    </Instance>
+  </Folder>
+</Resource>
\ No newline at end of file