Applied patch which solved conflicts between wxWidgets

[wxWidgets.git] / wxPython / demo / Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 250ede5fc2312868f04a1725555cd34a4f4ce4ce..a31707912be8faaca1f691e0aab7b0be1900eef7 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -48,6 +48,7 @@ _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
         'StandardPaths',
+        'MediaCtrl',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -151,6 +152,7 @@ _treeList = [
         'FloatCanvas',
         'HtmlWindow',
         'IntCtrl',
+        'MediaCtrl',
         'MVCTree',   
         'MaskedEditControls',
         'MaskedNumCtrl',