diff --git a/TODO.txt b/TODO.txt
index 0a499371..81b6524b 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -136,7 +136,6 @@ other dev stuff
       * hyperlink
       * pickerbase, clrpicker, filepicker, fontpicker
       * filectrl
-      * commandlinkbutton
       * axbase  (ActiveX.  Need to figure out best ways to do MSW-only items...)
       * tipdlg
       * check that all items in _functions.i and _misc.i have been wrapped
diff --git a/etg/_adv.py b/etg/_adv.py
index 3f123e2f..87a19985 100644
--- a/etg/_adv.py
+++ b/etg/_adv.py
@@ -27,6 +27,7 @@ ITEMS  = [ ]
 INCLUDES = [  
              'aboutdlg',
              'helpext',
+             'commandlinkbutton',
              
              # TODOs - 
              # These modules are also in the C++ adv lib and so should included be here:
@@ -35,7 +36,6 @@ INCLUDES = [
              #'bannerwindow',
              #'bmpcbox',
              #'calctrl',
-             #'commandlinkbutton',
              #'datectrl',
              #'dateevt',
              #'editlbox',
diff --git a/etg/commandlinkbutton.py b/etg/commandlinkbutton.py
new file mode 100644
index 00000000..d8150512
--- /dev/null
+++ b/etg/commandlinkbutton.py
@@ -0,0 +1,47 @@
+#---------------------------------------------------------------------------
+# Name:        etg/commandlinkbutton.py
+# Author:      Robin Dunn
+#
+# Created:     09-Apr-2012
+# Copyright:   (c) 2012 by Total Control Software
+# License:     wxWindows License
+#---------------------------------------------------------------------------
+
+import etgtools
+import etgtools.tweaker_tools as tools
+
+PACKAGE   = "wx"   
+MODULE    = "_adv"
+NAME      = "commandlinkbutton"   # Base name of the file to generate to for this script
+DOCSTRING = ""
+
+# The classes and/or the basename of the Doxygen XML files to be processed by
+# this script. 
+ITEMS  = [ "wxCommandLinkButton",
+           ]    
+    
+#---------------------------------------------------------------------------
+
+def run():
+    # Parse the XML file(s) building a collection of Extractor objects
+    module = etgtools.ModuleDef(PACKAGE, MODULE, NAME, DOCSTRING)
+    etgtools.parseDoxyXML(module, ITEMS)
+    
+    #-----------------------------------------------------------------
+    # Tweak the parsed meta objects in the module object as needed for
+    # customizing the generated code and docstrings.
+    
+    c = module.find('wxCommandLinkButton')
+    assert isinstance(c, etgtools.ClassDef)
+    tools.fixWindowClass(c)
+    
+    
+    #-----------------------------------------------------------------
+    tools.doCommonTweaks(module)
+    tools.runGenerators(module)
+    
+    
+#---------------------------------------------------------------------------
+if __name__ == '__main__':
+    run()
+
diff --git a/unittests/test_commandlinkbutton.py b/unittests/test_commandlinkbutton.py
new file mode 100644
index 00000000..0e84be43
--- /dev/null
+++ b/unittests/test_commandlinkbutton.py
@@ -0,0 +1,27 @@
+import imp_unittest, unittest
+import wtc
+import wx, wx.adv
+
+#---------------------------------------------------------------------------
+
+class commandlinkbutton_Tests(wtc.WidgetTestCase):
+
+    def test_commandlinkbutton1(self):
+        b = wx.adv.CommandLinkButton(self.frame, -1, "mainlabel", "note")
+
+    def test_commandlinkbutton2(self):
+        b = wx.adv.CommandLinkButton()
+        b.Create(self.frame, -1, "mainlabel", "note")
+
+    def test_commandlinkbutton3(self):
+        b = wx.adv.CommandLinkButton(self.frame, -1, "mainlabel", "note")
+        b.SetMainLabelAndNote("new main label", "new note")
+        # properties
+        b.Label
+        b.MainLabel
+        b.Note
+        
+#---------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    unittest.main()