From 4ec49d7e75ce41776f79c0d3dfa3b349468fef30 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 28 Jun 2016 17:17:00 -0700
Subject: [PATCH] Add the concrete art provider classes, and finish tests in
 test_ribbon_art

---
 docs/sphinx/itemToModuleMap.json |  2 ++
 etg/ribbon_art.py                | 16 ++++++++++++++++
 ext/wxWidgets                    |  2 +-
 unittests/test_ribbon_art.py     | 14 +++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index c840dc01..a8170d22 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -2821,6 +2821,7 @@
 "RendererNative":"wx.",
 "RendererVersion":"wx.",
 "ResourceCat":"wx.StandardPaths.",
+"RibbonAUIArtProvider":"wx.ribbon.",
 "RibbonArtProvider":"wx.ribbon.",
 "RibbonArtSetting":"wx.ribbon.",
 "RibbonBar":"wx.ribbon.",
@@ -2835,6 +2836,7 @@
 "RibbonGallery":"wx.ribbon.",
 "RibbonGalleryButtonState":"wx.ribbon.",
 "RibbonGalleryEvent":"wx.ribbon.",
+"RibbonMSWArtProvider":"wx.ribbon.",
 "RibbonPage":"wx.ribbon.",
 "RibbonPageTabInfo":"wx.ribbon.",
 "RibbonPanel":"wx.ribbon.",
diff --git a/etg/ribbon_art.py b/etg/ribbon_art.py
index aaeef1eb..cfcf951a 100644
--- a/etg/ribbon_art.py
+++ b/etg/ribbon_art.py
@@ -18,6 +18,8 @@ DOCSTRING = ""
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
 ITEMS  = [ 'wxRibbonArtProvider',
+           'wxRibbonMSWArtProvider',
+           'wxRibbonAUIArtProvider',
            ]
     
 #---------------------------------------------------------------------------
@@ -36,6 +38,20 @@ def run():
     c.find('Clone').factory = True
 
 
+    c = module.find('wxRibbonMSWArtProvider')
+    c.find('Clone').factory = True
+
+
+    c = module.find('wxRibbonAUIArtProvider')
+    c.find('Clone').factory = True
+
+
+    module.addPyCode("""\
+        if 'wxMSW' in wx.PlatformInfo:
+            RibbonDefaultArtProvider = RibbonMSWArtProvider
+        else:
+            RibbonDefaultArtProvider = RibbonAUIArtProvider
+        """)
 
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
diff --git a/ext/wxWidgets b/ext/wxWidgets
index 95bff549..c1a1a130 160000
--- a/ext/wxWidgets
+++ b/ext/wxWidgets
@@ -1 +1 @@
-Subproject commit 95bff5496bd14bac6dbc2243770cbc11b8023d96
+Subproject commit c1a1a1303218a3b1560f92d245e25cbde3e8de00
diff --git a/unittests/test_ribbon_art.py b/unittests/test_ribbon_art.py
index 28aaf0ab..74083083 100644
--- a/unittests/test_ribbon_art.py
+++ b/unittests/test_ribbon_art.py
@@ -150,17 +150,25 @@ class ribbon_art_Tests(wtc.WidgetTestCase):
         
     
     def test_ribbon_art3(self):
-        pass
+        art = wx.ribbon.RibbonMSWArtProvider()
 
 
     def test_ribbon_art4(self):
-        pass
+        art = wx.ribbon.RibbonAUIArtProvider()
 
 
     def test_ribbon_art5(self):
-        pass
+        art = wx.ribbon.RibbonAUIArtProvider()
+        clone = art.Clone()
+        art.Flags
+        art.GetFlags()
+        art.GetFlags()
 
 
+    def test_ribbon_art6(self):
+        self.assertTrue(
+            wx.ribbon.RibbonDefaultArtProvider in [wx.ribbon.RibbonMSWArtProvider,
+                                                   wx.ribbon.RibbonAUIArtProvider])
 
 #---------------------------------------------------------------------------