Add wx.richtext.RichTextFormattingDialog

docs/sphinx/itemToModuleMap.json

@@ -2919,6 +2919,11 @@
 "RICHTEXT_FIXED_HEIGHT":"wx.richtext.",
 "RICHTEXT_FIXED_WIDTH":"wx.richtext.",
 "RICHTEXT_FORMATTED":"wx.richtext.",
+"RICHTEXT_FORMAT_BULLETS":"wx.richtext.",
+"RICHTEXT_FORMAT_FONT":"wx.richtext.",
+"RICHTEXT_FORMAT_INDENTS_SPACING":"wx.richtext.",
+"RICHTEXT_FORMAT_STYLE_EDITOR":"wx.richtext.",
+"RICHTEXT_FORMAT_TABS":"wx.richtext.",
 "RICHTEXT_HANDLER_CONVERT_FACENAMES":"wx.richtext.",
 "RICHTEXT_HANDLER_INCLUDE_STYLESHEET":"wx.richtext.",
 "RICHTEXT_HANDLER_NO_HEADER_FOOTER":"wx.richtext.",
@@ -3064,6 +3069,8 @@
 "RichTextFileHandler":"wx.richtext.",
 "RichTextFileType":"wx.richtext.",
 "RichTextFontTable":"wx.richtext.",
+"RichTextFormattingDialog":"wx.richtext.",
+"RichTextFormattingDialogFactory":"wx.richtext.",
 "RichTextHTMLHandler":"wx.richtext.",
 "RichTextHasStyle":"wx.richtext.",
 "RichTextHeaderFooterData":"wx.richtext.",

etg/_richtext.py

@@ -40,7 +40,7 @@ INCLUDES = [ 'richtextbuffer',
              'richtextstyles',
              'richtextstyledlg',
              'richtextsymboldlg',
-             #'richtextformatdlg',             TODO: Needs wxPropertySheetDialog
+             'richtextformatdlg',
              ]
 
 
@@ -71,7 +71,9 @@ def run():
     module.addPyCode("import wx.xml", order=10)
     module.addImport('_html')
     module.addPyCode("import wx.html", order=10)
-    
+    module.addImport('_adv')
+    module.addPyCode("import wx.adv", order=10)
+
     module.addInclude(INCLUDES)
           
     #-----------------------------------------------------------------

etg/richtextformatdlg.py

@@ -10,38 +10,39 @@
 import etgtools
 import etgtools.tweaker_tools as tools
 
-PACKAGE   = "wx"   
+PACKAGE   = "wx"
 MODULE    = "_richtext"
 NAME      = "richtextformatdlg"   # 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. 
+# this script.
 ITEMS  = [ "wxRichTextFormattingDialogFactory",
            "wxRichTextFormattingDialog",
-           ]    
-    
+           ]
+
 #---------------------------------------------------------------------------
 
 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('wxRichTextFormattingDialog')
     assert isinstance(c, etgtools.ClassDef)
     tools.fixTopLevelWindowClass(c)
-    
-    
+    tools.ignoreConstOverloads(c)
+
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)
-    
-    
+
+
 #---------------------------------------------------------------------------
 if __name__ == '__main__':
     run()

unittests/test_richtextformatdlg.py

@@ -7,7 +7,6 @@ import wx.richtext
 
 class richtextformatdlg_Tests(wtc.WidgetTestCase):
 
-    @unittest.expectedFailure  # richtextformatdlg not implemented yet
     def test_richtextformatdlg1(self):
         wx.richtext.RICHTEXT_FORMAT_FONT           
         wx.richtext.RICHTEXT_FORMAT_TABS           
@@ -16,13 +15,14 @@ class richtextformatdlg_Tests(wtc.WidgetTestCase):
         wx.richtext.RICHTEXT_FORMAT_INDENTS_SPACING
         
 
-    @unittest.expectedFailure  # richtextformatdlg not implemented yet
     def test_richtextformatdlg2(self):
         dlg = wx.richtext.RichTextFormattingDialog(
             wx.richtext.RICHTEXT_FORMAT_FONT,
             self.frame)
-        self.runDialog(dlg)
-        
+        wx.CallLater(250, dlg.EndModal, wx.ID_OK)
+        dlg.ShowModal()
+        dlg.Destroy()
+
 #---------------------------------------------------------------------------
 
 if __name__ == '__main__':