diff --git a/etg/_core.py b/etg/_core.py
index dab73bc4..1a85c56a 100644
--- a/etg/_core.py
+++ b/etg/_core.py
@@ -91,6 +91,7 @@ INCLUDES = [  'defs',
               'menuitem',
               
               # toplevel and dialogs
+              'nonownedwnd',
               'toplevel',
               'dialog',
               'dirdlg',
diff --git a/etg/graphics.py b/etg/graphics.py
index 8d608ac7..9e510ba0 100644
--- a/etg/graphics.py
+++ b/etg/graphics.py
@@ -18,6 +18,7 @@ DOCSTRING = ""
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
 ITEMS  = [ 
+            'wxGraphicsBitmap',
             'wxGraphicsBrush',
             'wxGraphicsContext',
             'wxGraphicsFont',
diff --git a/etg/nonownedwnd.py b/etg/nonownedwnd.py
new file mode 100644
index 00000000..c1db90ac
--- /dev/null
+++ b/etg/nonownedwnd.py
@@ -0,0 +1,46 @@
+#---------------------------------------------------------------------------
+# Name:        etg/nonownedwnd.py
+# Author:      Robin Dunn
+#
+# Created:     10-Oct-2011
+# Copyright:   (c) 2011 by Total Control Software
+# License:     wxWindows License
+#---------------------------------------------------------------------------
+
+import etgtools
+import etgtools.tweaker_tools as tools
+
+PACKAGE   = "wx"   
+MODULE    = "_core"
+NAME      = "nonownedwnd"   # 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  = [ 'wxNonOwnedWindow' ]    
+    
+#---------------------------------------------------------------------------
+
+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('wxNonOwnedWindow')
+    assert isinstance(c, etgtools.ClassDef)
+    
+    
+    #-----------------------------------------------------------------
+    tools.doCommonTweaks(module)
+    tools.addGetterSetterProps(module)
+    tools.runGenerators(module)
+    
+    
+#---------------------------------------------------------------------------
+if __name__ == '__main__':
+    run()
+